diff --git a/lib/screens/patients/patients_screen.dart b/lib/screens/patients/patients_screen.dart index 2fa0507a..065c0bb8 100644 --- a/lib/screens/patients/patients_screen.dart +++ b/lib/screens/patients/patients_screen.dart @@ -326,7 +326,10 @@ class _PatientsScreenState extends State { } } else { if (isView == false && val2 == 1) { - lItems = res['GetPatientFileInformation_PRMList']; + lItems = res['GetPatientFileInformation_PRMList'] + .where((i) => + i['PatientTypeDescription'] == 'Permanent File') + .toList(); } else { lItems = res[SERVICES_PATIANT2[val2]]; } @@ -404,10 +407,30 @@ class _PatientsScreenState extends State { ), Container( margin: EdgeInsets.only( - top: MediaQuery.of(context).size.height * 0.35), - child: DrAppEmbeddedError( - error: TranslationBase.of(context) - .youDontHaveAnyPatient), + top: MediaQuery.of(context).size.height * 0.10), + child: Center( + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + SizedBox( + height: 100, + ), + Image.asset('assets/images/no-data.png'), + Padding( + padding: const EdgeInsets.all(8.0), + child: Texts(TranslationBase.of(context) + .youDontHaveAnyPatient), + ) + ], + ), + ) + // : Center( + // child: DrAppEmbeddedError( + // error: TranslationBase.of( + // context) + // .youDontHaveAnyPatient), + // ), + , ), ], ) @@ -837,6 +860,11 @@ class _PatientsScreenState extends State { DateTime.now().day + 1), 'yyyy-MM-dd'); } else if (item == 'Next Week') { + _patientSearchFormValues.From = DateUtils.convertDateToFormat( + DateTime(DateTime.now().year, DateTime.now().month, + DateTime.now().day + 1), + 'yyyy-MM-dd'); + _patientSearchFormValues.To = DateUtils.convertDateToFormat( DateTime(DateTime.now().year, DateTime.now().month, DateTime.now().day + 6),