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 e0a83857..70591d1f 100644 --- a/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart +++ b/lib/screens/patients/profile/profile_screen/patient_profile_screen.dart @@ -108,12 +108,12 @@ class _PatientProfileScreenState extends State patient: patient, isFromLiveCare: isFromLiveCare, isInpatient: isInpatient, - height: (patient.patientStatusType != null && - patient.patientStatusType == 43) - ? 220 - : isDischargedPatient - ? 240 - : 0, + // height: (patient.patientStatusType != null && + // patient.patientStatusType == 43) + // ? 220 + // : isDischargedPatient + // ? 240 + // : 0, isDischargedPatient: isDischargedPatient), ), Container( diff --git a/lib/widgets/patients/profile/patient-profile-app-bar.dart b/lib/widgets/patients/profile/patient-profile-app-bar.dart index 8816ba84..8caf6754 100644 --- a/lib/widgets/patients/profile/patient-profile-app-bar.dart +++ b/lib/widgets/patients/profile/patient-profile-app-bar.dart @@ -574,10 +574,14 @@ class PatientProfileAppBar extends StatelessWidget Size get preferredSize => Size( double.maxFinite, patientProfileAppBarModel.height == 0 - ? patientProfileAppBarModel.isInpatient - ? 160 - : patientProfileAppBarModel.isAppointmentHeader - ? 290 - : 170 + ? patientProfileAppBarModel.isAppointmentHeader + ? 270 + : ((patientProfileAppBarModel.patient.appointmentDate != null &&patientProfileAppBarModel.patient.appointmentDate.isNotEmpty ) + ? patientProfileAppBarModel.isFromLabResult?170:150 + : patientProfileAppBarModel.patient.admissionDate != null + ? 150 + : patientProfileAppBarModel.isDischargedPatient + ? 240 + : 130) : patientProfileAppBarModel.height); }