diff --git a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart index 6dfe77b0..0f550191 100644 --- a/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart +++ b/lib/screens/patients/profile/lab_result/all_lab_special_result_page.dart @@ -88,6 +88,9 @@ class _AllLabSpecialResultState extends State { ], ), ), + if(model.allSpecialLabList.length == 0) + ErrorMessage(error: TranslationBase.of(context).noItem), + if(model.allSpecialLabList.length > 0) ListView.builder( physics: NeverScrollableScrollPhysics(), itemCount: model.allSpecialLabList.length, diff --git a/lib/screens/patients/profile/notes/note/progress_note_screen.dart b/lib/screens/patients/profile/notes/note/progress_note_screen.dart index ae6681e7..c5efe09b 100644 --- a/lib/screens/patients/profile/notes/note/progress_note_screen.dart +++ b/lib/screens/patients/profile/notes/note/progress_note_screen.dart @@ -88,16 +88,7 @@ class _ProgressNoteState extends State { patient, isInpatient: true, ), - body: model.patientProgressNoteList == null || - model.patientProgressNoteList.length == 0 - ? widget.visitType == 3 - ? ErrorMessage( - error: TranslationBase.of(context).errorNoOrders, - ) - : ErrorMessage( - error: TranslationBase.of(context).errorNoProgressNote, - ) - : Container( + body: Container( color: Colors.grey[200], child: Column( children: [ @@ -125,7 +116,16 @@ class _ProgressNoteState extends State { ? TranslationBase.of(context).addNewOrderSheet : TranslationBase.of(context).addProgressNote, ), - Expanded( + model.patientProgressNoteList == null || + model.patientProgressNoteList.length == 0 + ? widget.visitType == 3 + ? ErrorMessage( + error: TranslationBase.of(context).errorNoOrders, + ) + : ErrorMessage( + error: TranslationBase.of(context).errorNoProgressNote, + ) + :Expanded( child: Container( child: ListView.builder( itemCount: model.patientProgressNoteList.length,