From 704a4bd0be87fec2ac1aa1ba898adeec3035a93a Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Thu, 22 Apr 2021 23:39:31 +0300 Subject: [PATCH 1/2] 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], ), From 8a63d8bb832f35ed25fec9c16aded334e8c297ab Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Fri, 23 Apr 2021 00:48:58 +0300 Subject: [PATCH 2/2] hot fixes --- lib/config/localized_values.dart | 4 ++-- lib/core/viewModel/patient-vital-sign-viewmodel.dart | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index fbd53016..e64913b6 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -30,7 +30,7 @@ const Map> localizedValues = { 'ar': 'ملاحضات وتفاصيل العيادة' }, 'outPatients': {'en': 'Out Patient', 'ar': 'المريض الخارجي'}, - 'myOutPatient': {'en': 'My Out Patients', 'ar': 'المريض الخارجي'}, + 'myOutPatient': {'en': 'My OutPatients', 'ar': 'المريض الخارجي'}, 'searchPatient': {'en': 'Search Patient', 'ar': 'البحث عن مريض'}, 'searchAbout': {'en': 'Search', 'ar': 'البحث عن'}, @@ -47,7 +47,7 @@ const Map> localizedValues = { 'radiology': {'en': 'Radiology', 'ar': 'الأشعة'}, 'service': {'en': 'Service', 'ar': 'خدمة'}, 'referral': {'en': 'Referral', 'ar': 'الإحالة'}, - 'inPatient': {'en': 'My In Patients', 'ar': 'المريض الداخلي'}, + 'inPatient': {'en': 'My InPatients', 'ar': 'المريض الداخلي'}, 'operations': {'en': 'Operations', 'ar': 'عمليات'}, 'patientServices': {'en': 'Patient Services', 'ar': 'خدمات المرضى'}, 'searchMedicine': {'en': 'Search Medicine', 'ar': 'بحث عن الدواء'}, diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index af3a441f..14aa1f06 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -47,11 +47,11 @@ class VitalSignsViewModel extends BaseViewModel { to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); } - if(isInPatient){ + // if(isInPatient){ await _vitalSignService.getInPatientVitalSignHistory(patient); - }else { - await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); - } + // }else { + // await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); + // } if (_vitalSignService.hasError) { error = _vitalSignService.error;