diff --git a/lib/screens/home/home_screen.dart b/lib/screens/home/home_screen.dart index 53a338a9..1435c942 100644 --- a/lib/screens/home/home_screen.dart +++ b/lib/screens/home/home_screen.dart @@ -545,6 +545,12 @@ class _HomeScreenState extends State { ), hasBorder: false, onTap: () { + + String date = DateUtils.convertDateToFormat( + DateTime(DateTime.now().year, DateTime.now().month, + DateTime.now().day ), + 'yyyy-MM-dd'); + Navigator.push( context, MaterialPageRoute( @@ -553,7 +559,7 @@ class _HomeScreenState extends State { isSearch: false, isInpatient: false, patientSearchRequestModel: - PatientSearchRequestModel(), + PatientSearchRequestModel(from: date, to: date), selectedPatientType: PatientType.OutPatient, isSearchWithKeyInfo: false, diff --git a/lib/screens/patients/patient_search/patients_screen_new.dart b/lib/screens/patients/patient_search/patients_screen_new.dart index bd2920dc..1e5f7339 100644 --- a/lib/screens/patients/patient_search/patients_screen_new.dart +++ b/lib/screens/patients/patient_search/patients_screen_new.dart @@ -93,7 +93,12 @@ class _PatientsScreenNewState extends State { }, builder: (_, model, w) => AppScaffold( appBarTitle: "Search Patient", - isShowAppBar: false, + isShowAppBar: true, + appBar: !widget.isSearch && !widget.isInpatient?HeaderInSearch( + title: "My Out patient", + ):HeaderInSearch( + title: "Search for ${widget.searchKey}", + ), baseViewModel: model, body: Container( color: Colors.grey[200], @@ -103,14 +108,6 @@ class _PatientsScreenNewState extends State { Container( child: Column( children: [ - if(widget.isSearch) - HeaderInSearch( - title: "Search for ${widget.searchKey}", - ), - if(!widget.isSearch && !widget.isInpatient) - HeaderInSearch( - title: "My Out patient", - ), if(!widget.isInpatient) Container( // color: Colors.red,