admission card values updated

lib/models/InPatientServices/get_admission_info_response_model.dart

@@ -19,28 +19,34 @@ class GetAdmissionInfoResponseModel {
   int status;
   String statusDesc;
   String statusDescN;
+  String clinicName;
+  String doctorName;
+  String projectName;
 
   GetAdmissionInfoResponseModel(
       {this.setupID,
-      this.projectID,
-      this.admissionNo,
-      this.admissionDate,
-      this.admissionRequestNo,
-      this.admissionType,
-      this.patientType,
-      this.patientID,
-      this.clinicID,
-      this.doctorID,
-      this.admittingClinicID,
-      this.admittingDoctorID,
-      this.categoryID,
-      this.roomID,
-      this.bedID,
-      this.dischargeDate,
-      this.approvalNo,
-      this.status,
-      this.statusDesc,
-      this.statusDescN});
+        this.projectID,
+        this.admissionNo,
+        this.admissionDate,
+        this.admissionRequestNo,
+        this.admissionType,
+        this.patientType,
+        this.patientID,
+        this.clinicID,
+        this.doctorID,
+        this.admittingClinicID,
+        this.admittingDoctorID,
+        this.categoryID,
+        this.roomID,
+        this.bedID,
+        this.dischargeDate,
+        this.approvalNo,
+        this.status,
+        this.statusDesc,
+        this.statusDescN,
+        this.clinicName,
+        this.doctorName,
+        this.projectName});
 
   GetAdmissionInfoResponseModel.fromJson(Map<String, dynamic> json) {
     setupID = json['SetupID'];
@@ -63,6 +69,9 @@ class GetAdmissionInfoResponseModel {
     status = json['Status'];
     statusDesc = json['StatusDesc'];
     statusDescN = json['StatusDescN'];
+    clinicName = json['ClinicName'];
+    doctorName = json['DoctorName'];
+    projectName = json['ProjectName'];
   }
 
   Map<String, dynamic> toJson() {
@@ -87,6 +96,9 @@ class GetAdmissionInfoResponseModel {
     data['Status'] = this.status;
     data['StatusDesc'] = this.statusDesc;
     data['StatusDescN'] = this.statusDescN;
+    data['ClinicName'] = this.clinicName;
+    data['DoctorName'] = this.doctorName;
+    data['ProjectName'] = this.projectName;
     return data;
   }
 }

lib/pages/InPatientServices/admission_notice.dart

@@ -148,7 +148,9 @@ class _AdmissionNoticeState extends State<AdmissionNotice> {
                           Padding(
                             padding: const EdgeInsets.only(left: 20, right: 20),
                             child: Text(
-                              projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.doctorID.toString() : projectViewModel.getAdmissionRequestInfoResponseModel.doctorName,
+                              projectViewModel.isPatientAdmitted
+                                  ? projectViewModel.getAdmissionInfoResponseModel.doctorName.toString()
+                                  : projectViewModel.getAdmissionRequestInfoResponseModel.doctorName,
                               style: TextStyle(
                                 color: Colors.white,
                                 fontWeight: FontWeight.bold,
@@ -162,7 +164,11 @@ class _AdmissionNoticeState extends State<AdmissionNotice> {
                           Padding(
                             padding: const EdgeInsets.only(left: 20, right: 20),
                             child: Text(
-                              TranslationBase.of(context).clinic + ": " + (projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.clinicID.toString() : projectViewModel.getAdmissionRequestInfoResponseModel.clinicName),
+                              TranslationBase.of(context).clinic +
+                                  ": " +
+                                  (projectViewModel.isPatientAdmitted
+                                      ? projectViewModel.getAdmissionInfoResponseModel.clinicName.toString()
+                                      : projectViewModel.getAdmissionRequestInfoResponseModel.clinicName),
                               style: TextStyle(
                                 color: Colors.white,
                                 fontSize: 15,
@@ -174,7 +180,11 @@ class _AdmissionNoticeState extends State<AdmissionNotice> {
                           Padding(
                             padding: const EdgeInsets.only(left: 20, right: 20),
                             child: Text(
-                              TranslationBase.of(context).hospital + ": " + (projectViewModel.isPatientAdmitted ? projectViewModel.getAdmissionInfoResponseModel.projectID.toString() : projectViewModel.getAdmissionRequestInfoResponseModel.projectName),
+                              TranslationBase.of(context).hospital +
+                                  ": " +
+                                  (projectViewModel.isPatientAdmitted
+                                      ? projectViewModel.getAdmissionInfoResponseModel.projectName.toString()
+                                      : projectViewModel.getAdmissionRequestInfoResponseModel.projectName),
                               style: TextStyle(
                                 color: Colors.white,
                                 fontSize: 15,