From b6a6f16b31f755bddd9e716ff3875046a137cd60 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Thu, 22 Apr 2021 11:14:27 +0300 Subject: [PATCH] add vital sign inPatient --- lib/config/localized_values.dart | 1 + .../service/patient-vital-signs-service.dart | 25 +++++++++++++ lib/core/service/patient_service.dart | 36 ------------------- .../patient-vital-sign-viewmodel.dart | 9 +++-- lib/core/viewModel/patient_view_model.dart | 10 ------ .../patient-vital-sign-history.dart | 2 +- .../vital_sign/vital_sign_details_screen.dart | 2 +- lib/util/translations_delegate_base.dart | 4 +-- ...-profile-header-new-design_in_patient.dart | 21 ++++++++--- 9 files changed, 53 insertions(+), 57 deletions(-) diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index 9f502856..4cbfcb01 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -856,4 +856,5 @@ const Map> localizedValues = { }, "updateNow": {"en": "Update Now", "ar": "تحديث الان"}, "updateTheApp": {"en": "Update The App", "ar": "تحديث التطبيق"}, + "numOfDays": {"en": "Number of Days", "ar": "عدد الأيام"}, }; diff --git a/lib/core/service/patient-vital-signs-service.dart b/lib/core/service/patient-vital-signs-service.dart index 75bc955f..8a3be29b 100644 --- a/lib/core/service/patient-vital-signs-service.dart +++ b/lib/core/service/patient-vital-signs-service.dart @@ -68,4 +68,29 @@ class VitalSignsService extends BaseService { body: body, ); } + + Future getInPatientVitalSignHistory(PatiantInformtion patient) async { + hasError = false; + Map body = Map(); + body['PatientID'] = patient.patientId; + body['InOutPatientType'] = 1; + body['PatientTypeID'] = 1; + + await baseAppClient.post( + GET_PATIENT_VITAL_SIGN, + onSuccess: (dynamic response, int statusCode) { + patientVitalSignsHistory.clear(); + if (response['List_DoctorPatientVitalSign'] != null) { + response['List_DoctorPatientVitalSign'].forEach((v) { + patientVitalSignsHistory.add(new VitalSignHistory.fromJson(v)); + }); + } + }, + onFailure: (String error, int statusCode) { + hasError = true; + super.error = error.toString(); + }, + body: body, + ); + } } diff --git a/lib/core/service/patient_service.dart b/lib/core/service/patient_service.dart index aea26e8a..4f135eaa 100644 --- a/lib/core/service/patient_service.dart +++ b/lib/core/service/patient_service.dart @@ -138,42 +138,6 @@ class PatientService extends BaseService { return Future.value(localRes); } - Future getPatientVitalSign(patient) async { - hasError = false; - await baseAppClient.post( - GET_PATIENT_VITAL_SIGN, - onSuccess: (dynamic response, int statusCode) { - _patientVitalSignList = []; - response['List_DoctorPatientVitalSign'].forEach((v) { - _patientVitalSignList.add(new VitalSignResModel.fromJson(v)); - }); - - if (_patientVitalSignList.length > 0) { - List patientVitalSignOrderdSubListTemp = []; - patientVitalSignOrderdSubListTemp = _patientVitalSignList; - patientVitalSignOrderdSubListTemp - .sort((VitalSignResModel a, VitalSignResModel b) { - return b.vitalSignDate.microsecondsSinceEpoch - - a.vitalSignDate.microsecondsSinceEpoch; - }); - patientVitalSignOrderdSubList.clear(); - int length = patientVitalSignOrderdSubListTemp.length >= 20 - ? 20 - : patientVitalSignOrderdSubListTemp.length; - for (int x = 0; x < length; x++) { - patientVitalSignOrderdSubList - .add(patientVitalSignOrderdSubListTemp[x]); - } - } - }, - onFailure: (String error, int statusCode) { - hasError = true; - super.error = error; - }, - body: patient, - ); - } - Future getLabResultOrders(patient) async { hasError = false; await baseAppClient.post( diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index 652bfed7..af3a441f 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -38,7 +38,7 @@ class VitalSignsViewModel extends BaseViewModel { } Future getPatientVitalSignHistory( - PatiantInformtion patient, String from, String to) async { + PatiantInformtion patient, String from, String to, bool isInPatient) async { setState(ViewState.Busy); if (from == null || from == "0") { from = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); @@ -47,7 +47,12 @@ class VitalSignsViewModel extends BaseViewModel { to = DateUtils.convertDateToFormat(DateTime.now(), 'yyyy-MM-dd'); } - await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); + if(isInPatient){ + await _vitalSignService.getInPatientVitalSignHistory(patient); + }else { + await _vitalSignService.getPatientVitalSignsHistory(patient, from, to); + } + if (_vitalSignService.hasError) { error = _vitalSignService.error; setState(ViewState.Error); diff --git a/lib/core/viewModel/patient_view_model.dart b/lib/core/viewModel/patient_view_model.dart index 9e938630..00b64204 100644 --- a/lib/core/viewModel/patient_view_model.dart +++ b/lib/core/viewModel/patient_view_model.dart @@ -66,16 +66,6 @@ class PatientViewModel extends BaseViewModel { return localRes; } - Future getPatientVitalSign(patient) async { - setState(ViewState.Busy); - await _patientService.getPatientVitalSign(patient); - if (_patientService.hasError) { - error = _patientService.error; - setState(ViewState.Error); - } else - setState(ViewState.Idle); - } - Future getLabResultOrders(patient) async { setState(ViewState.Busy); await _patientService.getLabResultOrders(patient); diff --git a/lib/models/patient/vital_sign/patient-vital-sign-history.dart b/lib/models/patient/vital_sign/patient-vital-sign-history.dart index 40ff5d00..e5f5abd0 100644 --- a/lib/models/patient/vital_sign/patient-vital-sign-history.dart +++ b/lib/models/patient/vital_sign/patient-vital-sign-history.dart @@ -35,7 +35,7 @@ class VitalSignHistory { var triageCategory; var gCScore; var lineItemNo; - DateTime vitalSignDate; + var vitalSignDate; var actualTimeTaken; var sugarLevel; var fBS; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart index a79bd20c..f333a73f 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_details_screen.dart @@ -35,7 +35,7 @@ class VitalSignDetailsScreen extends StatelessWidget { return BaseView( onModelReady: (model) => - model.getPatientVitalSignHistory(patient, from, to), + model.getPatientVitalSignHistory(patient, from, to, patientType == "1"), builder: (_, mode, widget) => AppScaffold( baseViewModel: mode, isShowAppBar: true, diff --git a/lib/util/translations_delegate_base.dart b/lib/util/translations_delegate_base.dart index 827922bc..f06b4744 100644 --- a/lib/util/translations_delegate_base.dart +++ b/lib/util/translations_delegate_base.dart @@ -1229,8 +1229,8 @@ class TranslationBase { localizedValues['patientIDMobilenational'][locale.languageCode]; String get updateNow => localizedValues['updateNow'][locale.languageCode]; - String get updateTheApp => - localizedValues['updateTheApp'][locale.languageCode]; + String get updateTheApp => localizedValues['updateTheApp'][locale.languageCode]; + String get numOfDays => localizedValues['numOfDays'][locale.languageCode]; } class TranslationBaseDelegate extends LocalizationsDelegate { diff --git a/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart b/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart index bdf1a301..0425794b 100644 --- a/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart +++ b/lib/widgets/patients/profile/patient-profile-header-new-design_in_patient.dart @@ -124,11 +124,11 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget { ), Row( children: [ - // AppText( - // "Date", - // fontWeight: FontWeight.bold, - // fontSize: 1.4 * SizeConfig.textMultiplier, - // ), + AppText( + "7:00 PM st", + fontWeight: FontWeight.bold, + fontSize: 1.4 * SizeConfig.textMultiplier, + ), ], ) ], @@ -177,6 +177,17 @@ class PatientProfileHeaderNewDesignInPatient extends StatelessWidget { ) ], ), + Row( + children: [ + AppText( + "${TranslationBase.of(context).numOfDays}: ", + fontSize: 1.2 * SizeConfig.textMultiplier, + ), + AppText("4 st", + fontSize: 1.4 * SizeConfig.textMultiplier, + fontWeight: FontWeight.w700), + ], + ), ], ), ),