diff --git a/lib/screens/patients/PatientsInPatientScreen.dart b/lib/screens/patients/PatientsInPatientScreen.dart index ec9aeebc..f094f71a 100644 --- a/lib/screens/patients/PatientsInPatientScreen.dart +++ b/lib/screens/patients/PatientsInPatientScreen.dart @@ -69,8 +69,9 @@ class _PatientInPatientScreenState extends State await model.getSpecialClinicalCareMappingList(widget.specialClinic.clinicID); requestModel.nursingStationID = model.specialClinicalCareMappingList[0].nursingStationID; - requestModel.clinicID = 0; + } + requestModel.clinicID = 0; await model.getInPatientList(requestModel); }, builder: (_, model, w) => diff --git a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart index eec42b86..f170b128 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -204,7 +204,7 @@ class _PatientProfileScreenState extends State with Single ), ], ), - if ( (isInpatient && isMyPatient )? true:isFromLiveCare + if ( (isInpatient )? true:isFromLiveCare ? patient.episodeNo != null : patient.patientStatusType != null && patient.patientStatusType == 43) BaseView( @@ -222,7 +222,7 @@ class _PatientProfileScreenState extends State with Single AppButton( title: "${TranslationBase.of(context).createNew}\n${TranslationBase.of(context).episode}", - color: isFromLiveCare + color: isFromLiveCare ||isInpatient ? Colors.red.shade700 : patient.patientStatusType == 43 ? Colors.red.shade700 @@ -261,7 +261,7 @@ class _PatientProfileScreenState extends State with Single AppButton( title: "${TranslationBase.of(context).update}\n${TranslationBase.of(context).episode}", - color: (isInpatient &&isMyPatient ) || isFromLiveCare + color: (isInpatient ) || isFromLiveCare ? Colors.red.shade700 : patient.patientStatusType == 43 ? Colors.red.shade700