From 5075a52a025054555801ed267e7a7e2ce21a193a Mon Sep 17 00:00:00 2001 From: Elham Rababah Date: Sat, 24 Apr 2021 22:39:50 +0300 Subject: [PATCH] fix radiology date --- lib/core/model/radiology/final_radiology.dart | 3 +++ .../patients/profile/radiology/radiology_home_page.dart | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/core/model/radiology/final_radiology.dart b/lib/core/model/radiology/final_radiology.dart index 75e8bfe2..dcf365fe 100644 --- a/lib/core/model/radiology/final_radiology.dart +++ b/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']; diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 19ae8dd5..8ed61267 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/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 &&