Merge branch 'progress_note' into 'development'

fix radiology date

See merge request Cloud_Solution/doctor_app_flutter!578
merge-requests/579/merge
Mohammad Aljammal 5 years ago
commit 86b5640fe6

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

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

Loading…
Cancel
Save