diff --git a/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart index 542b182b..64a03586 100644 --- a/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart +++ b/lib/screens/patients/profile/referral/refer_details/referred_patient_detail_in-paint.dart @@ -148,7 +148,11 @@ class ReferredPatientDetailScreen extends StatelessWidget { : Colors.red[700]!, ), AppText( - AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "dd MMM,yyyy"), + patientType == PatientType.IN_PATIENT + ? AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "dd MMM,yyyy") + :AppDateUtils.getDayMonthYearDateFormatted(AppDateUtils.getDateTimeFromString( + referredPatient.referralDate!, + )), fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 2.0 * SizeConfig.textMultiplier!, @@ -179,7 +183,11 @@ class ReferredPatientDetailScreen extends StatelessWidget { ], ), AppText( - AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "hh:mm a"), + patientType == PatientType.IN_PATIENT + ? AppDateUtils.convertDateFromServerFormat(referredPatient.referralDate!, "hh:mm a") + :AppDateUtils.getTimeFormated(AppDateUtils.getDateTimeFromString( + referredPatient.referralDate!), + ), fontFamily: 'Poppins', fontWeight: FontWeight.w600, fontSize: 1.8 * SizeConfig.textMultiplier!, diff --git a/lib/screens/procedures/add_procedure_page.dart b/lib/screens/procedures/add_procedure_page.dart index a87016cb..fb1adfdb 100644 --- a/lib/screens/procedures/add_procedure_page.dart +++ b/lib/screens/procedures/add_procedure_page.dart @@ -147,7 +147,7 @@ class _AddProcedurePageState extends State { EntityListCheckboxSearchWidget( model: widget.model, masterList: model.categoriesList[0].entityList!, - shouldDisplaySearchField: false, + shouldDisplaySearchField: procedureType != ProcedureType.PROCEDURE , removeProcedure: (item) { EntityList? itemToBeRemoved = entityList.firstWhere((element) => item.procedureId == element.procedureId, orElse: () => EntityList()); if (itemToBeRemoved.procedureId != null) {