Finish arrived

lib/core/viewModel/patient_view_model.dart

@@ -49,7 +49,7 @@ class PatientViewModel extends BaseViewModel {
   List<dynamic> get referralFrequencyList =>
       _patientService.referalFrequancyList;
 
-  Future getPatientList(PatientModel patient, patientType,
+  Future getPatientList( patient, patientType,
       {bool isBusyLocal = false}) async {
     if (isBusyLocal) {
       setState(ViewState.BusyLocal);

lib/models/patient/patiant_info_model.dart

@@ -107,36 +107,36 @@ class PatiantInformtion {
 
   factory PatiantInformtion.fromJson(Map<String, dynamic> json) =>
       PatiantInformtion(
-        projectId: json["ProjectID"],
-        clinicId: json["ClinicID"],
-        doctorId: json["DoctorID"],
-        patientId: json["PatientID"],
-        doctorName: json["DoctorName"],
-        doctorNameN: json["DoctorNameN"],
-        firstName: json["FirstName"],
-        middleName: json["MiddleName"],
-        lastName: json["LastName"],
-        firstNameN: json["FirstNameN"],
-        middleNameN: json["MiddleNameN"],
-        lastNameN: json["LastNameN"],
-        gender: json["Gender"],
-        dateofBirth: json["DateofBirth"],
-        nationalityId: json["NationalityID"],
-        mobileNumber: json["MobileNumber"],
-        emailAddress: json["EmailAddress"],
-        patientIdentificationNo: json["PatientIdentificationNo"],
-        patientType: json["PatientType"],
-        admissionNo: json["AdmissionNo"],
-        admissionDate: json["AdmissionDate"],
-        roomId: json["RoomID"],
-        bedId: json["BedID"],
-        nursingStationId: json["NursingStationID"],
-        description: json["Description"],
-        clinicDescription: json["ClinicDescription"],
-        clinicDescriptionN: json["ClinicDescriptionN"],
-        nationalityName: json["NationalityName"],
-        nationalityNameN: json["NationalityNameN"],
-        age: json["Age"],
+        projectId: json["ProjectID"] ?? json["projectID"],
+        clinicId: json["ClinicID"]?? json["clinicID"],
+        doctorId: json["DoctorID"]?? json["doctorID"],
+        patientId: json["PatientID"]?? json["patientID"],
+        doctorName: json["DoctorName"]?? json["doctorName"],
+        doctorNameN: json["DoctorNameN"]?? json["doctorNameN"],
+        firstName: json["FirstName"]?? json["firstName"],
+        middleName: json["MiddleName"]?? json["middleName"],
+        lastName: json["LastName"]?? json["lastName"],
+        firstNameN: json["FirstNameN"]?? json["firstNameN"],
+        middleNameN: json["MiddleNameN"]?? json["middleNameN"],
+        lastNameN: json["LastNameN"]?? json["lastNameN"],
+        gender: json["Gender"]?? json["gender"],
+        dateofBirth: json["DateofBirth"]?? json["dob"],
+        nationalityId: json["NationalityID"]?? json["nationalityID"],
+        mobileNumber: json["MobileNumber"]?? json["mobileNumber"],
+        emailAddress: json["EmailAddress"]?? json["emailAddress"],
+        patientIdentificationNo: json["PatientIdentificationNo"]?? json["patientIdentificationNo"],
+        patientType: json["PatientType"]?? json["patientType"],
+        admissionNo: json["AdmissionNo"]?? json["admissionNo"],
+        admissionDate: json["AdmissionDate"]?? json["admissionDate"],
+        roomId: json["RoomID"]?? json["roomID"],
+        bedId: json["BedID"]?? json["bedID"],
+        nursingStationId: json["NursingStationID"]?? json["nursingStationID"],
+        description: json["Description"]?? json["description"],
+        clinicDescription: json["ClinicDescription"]?? json["clinicDescription"],
+        clinicDescriptionN: json["ClinicDescriptionN"]?? json["clinicDescriptionN"],
+        nationalityName: json["NationalityName"]?? json["nationalityName"],
+        nationalityNameN: json["NationalityNameN"]?? json["nationalityNameN"],
+        age: json["Age"]?? json["age"],
         genderDescription: json["GenderDescription"],
         nursingStationName: json["NursingStationName"],
         appointmentDate: json["AppointmentDate"]?? '',

lib/screens/patients/patients_screen.dart

@@ -282,7 +282,14 @@ class _PatientsScreenState extends State<PatientsScreen> {
                 _isLoading = false;
                 this.error = error.toString();
               } else {
-                lItems = res[SERVICES_PATIANT2[val2]]["entityList"];
+
+                var localList=[];
+                res["patientArrivalList"]["entityList"].forEach((v) {
+                  Map<String,dynamic> mergedPatient= {...v,...v["patientDetails"]};
+                  localList.add(mergedPatient);
+                });
+                print(localList.toString());
+                lItems = localList;//res[SERVICES_PATIANT2[val2]]["entityList"];
               }
             } else {
               lItems = res[SERVICES_PATIANT2[val2]];