From 3a8225e66632573388948a748b041f3c2eef8ccd Mon Sep 17 00:00:00 2001 From: Mohammad Aljammal Date: Sun, 4 Apr 2021 14:10:12 +0300 Subject: [PATCH] hot fix --- lib/screens/patients/profile/lab_result/labs_home_page.dart | 2 +- .../patients/profile/radiology/radiology_home_page.dart | 2 +- lib/screens/prescription/prescriptions_page.dart | 2 +- .../profile/patient-profile-header-new-design-app-bar.dart | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) 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 bdc001fb..23f40f06 100644 --- a/lib/screens/patients/profile/lab_result/labs_home_page.dart +++ b/lib/screens/patients/profile/lab_result/labs_home_page.dart @@ -66,7 +66,7 @@ class LabsHomePage extends StatelessWidget { ], ), ), - if (patientType != null && patientType == '7') + if (patientType != null && patientType == '7' && patient.patientStatusType == 43) InkWell( onTap: () { addSelectedLabOrder(context, model, patient); diff --git a/lib/screens/patients/profile/radiology/radiology_home_page.dart b/lib/screens/patients/profile/radiology/radiology_home_page.dart index 51330bb1..27c58e99 100644 --- a/lib/screens/patients/profile/radiology/radiology_home_page.dart +++ b/lib/screens/patients/profile/radiology/radiology_home_page.dart @@ -62,7 +62,7 @@ class RadiologyHomePage extends StatelessWidget { ], ), ), - if (patientType != null && patientType == '7') + if (patientType != null && patientType == '7' && patient.patientStatusType == 43) InkWell( onTap: () { addSelectedRadiologyOrder(context, model, patient); diff --git a/lib/screens/prescription/prescriptions_page.dart b/lib/screens/prescription/prescriptions_page.dart index 478d364b..0c33c6e5 100644 --- a/lib/screens/prescription/prescriptions_page.dart +++ b/lib/screens/prescription/prescriptions_page.dart @@ -60,7 +60,7 @@ class PrescriptionsPage extends StatelessWidget { ], ), ), - if (patientType != null && patientType == '7') + if (patientType != null && patientType == '7' && patient.patientStatusType == 43) InkWell( onTap: () { addPrescriptionForm( diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart index ca8d6a4e..ac7537cd 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart @@ -44,10 +44,7 @@ class PatientProfileHeaderNewDesignAppBar extends StatelessWidget with Preferred onPressed: () => Navigator.pop(context), ), AppText( - (Helpers.capitalize(patient.firstName) + - " " + - Helpers.capitalize( - patient.lastName)), + patient.firstName!=null? (Helpers.capitalize(patient.firstName) + " " + Helpers.capitalize(patient.lastName)):'', fontSize: SizeConfig.textMultiplier * 3, fontWeight: FontWeight.bold, backGroundcolor: Colors.white,