From 704a4bd0be87fec2ac1aa1ba898adeec3035a93a Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 22 Apr 2021 23:39:31 +0300 Subject: [PATCH] hot fixes --- lib/models/patient/patiant_info_model.dart | 2 +- lib/screens/patients/profile/lab_result/labs_home_page.dart | 4 ++-- lib/widgets/shared/doctor_card.dart | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/models/patient/patiant_info_model.dart b/lib/models/patient/patiant_info_model.dart index ec0b0bfb..cf266faa 100644 --- a/lib/models/patient/patiant_info_model.dart +++ b/lib/models/patient/patiant_info_model.dart @@ -176,7 +176,7 @@ class PatiantInformtion { appointmentNo: json['appointmentNo'] ?? json['AppointmentNo'], appointmentType: json['appointmentType'], appointmentTypeId: json['appointmentTypeId']?? json['appointmentTypeid'], - arrivedOn: json['arrivedOn'], + arrivedOn: json['arrivedOn'] ?? json['ArrivedOn'], clinicGroupId: json['clinicGroupId'], companyName: json['companyName'], dischargeStatus: json['dischargeStatus'], diff --git a/lib/screens/patients/profile/lab_result/labs_home_page.dart b/lib/screens/patients/profile/lab_result/labs_home_page.dart index 188744c3..5a02eb8d 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -68,7 +68,7 @@ class LabsHomePage extends StatelessWidget { ], ), ), - if(patient.patientStatusType == 43) + if ( patient.patientStatusType!=null && patient.patientStatusType == 43) Padding( padding: const EdgeInsets.all(8.0), child: Column( @@ -88,7 +88,7 @@ class LabsHomePage extends StatelessWidget { ], ), ), - if (patientType != null && patientType == '7' && patient.patientStatusType == 43) + if ( patient.patientStatusType!=null && patient.patientStatusType == 43) AddNewOrder( onTap: () { Navigator.push( context, diff --git a/lib/widgets/shared/doctor_card.dart b/lib/widgets/shared/doctor_card.dart index 25b3dee1..c86e0211 100644 --- a/lib/widgets/shared/doctor_card.dart +++ b/lib/widgets/shared/doctor_card.dart @@ -110,7 +110,7 @@ class DoctorCard extends StatelessWidget { children: [ AppText( TranslationBase.of(context).orderNo + - ": ", + " ", color: Colors.grey[500], fontSize: 14, ), @@ -126,7 +126,7 @@ class DoctorCard extends StatelessWidget { AppText( TranslationBase.of(context) .invoiceNo + - ": ", + " ", fontSize: 14, color: Colors.grey[500], ),