Merge branch 'progress_note' into 'development'

fix radiology date

See merge request Cloud_Solution/doctor_app_flutter!578

lib/core/model/radiology/final_radiology.dart

@@ -9,6 +9,7 @@ class FinalRadiology {
   dynamic doctorID;
   dynamic clinicID;
   DateTime orderDate;
+  DateTime reportDate;
   dynamic reportData;
   dynamic imageURL;
   dynamic procedureID;
@@ -52,6 +53,7 @@ class FinalRadiology {
       this.doctorID,
       this.clinicID,
       this.orderDate,
+      this.reportDate,
       this.reportData,
       this.imageURL,
       this.procedureID,
@@ -95,6 +97,7 @@ class FinalRadiology {
       doctorID = json['DoctorID'];
       clinicID = json['ClinicID'];
       orderDate = DateUtils.convertStringToDate(json['OrderDate']);
+      reportDate = DateUtils.convertStringToDate(json['ReportDate']);
       reportData = json['ReportData'];
       imageURL = json['ImageURL'];
       procedureID = json['ProcedureID'];

lib/screens/patients/profile/radiology/radiology_home_page.dart

@@ -124,8 +124,8 @@ class RadiologyHomePage extends StatelessWidget {
                           branch: '${model.radiologyList[index].projectName}',
                           clinic: model.radiologyList[index].clinicDescription,
                           appointmentDate:
-                              model.radiologyList[index].orderDate ??
-                                  model.radiologyList[index].reportData,
+                          !isInpatient?model.radiologyList[index].orderDate :
+                                  model.radiologyList[index].reportDate,
                         ),
                       )),
               if (model.radiologyList.isEmpty &&