From 0e2b7001365e636118ea970df265e2b1032835a2 Mon Sep 17 00:00:00 2001 From: mosazaid Date: Mon, 10 May 2021 14:55:09 +0300 Subject: [PATCH] vital sign hot fix --- lib/core/viewModel/patient-vital-sign-viewmodel.dart | 4 ++-- .../patient/vital_sign/patient-vital-sign-history.dart | 8 ++++---- .../profile/vital_sign/vital_sign_detail_pain_scale.dart | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/core/viewModel/patient-vital-sign-viewmodel.dart b/lib/core/viewModel/patient-vital-sign-viewmodel.dart index 7ce4582a..bab2ff9f 100644 --- a/lib/core/viewModel/patient-vital-sign-viewmodel.dart +++ b/lib/core/viewModel/patient-vital-sign-viewmodel.dart @@ -98,8 +98,8 @@ class VitalSignsViewModel extends BaseViewModel { "${element.sAO2.toString()}"; /* - ${element.fIO2.toString()}*/ } if (painScore == null || painScore == "-") { - painScore = element.painScore.toString() != 'null' - ? element.painScore.toString() + painScore = element.painScoreDesc.toString() != 'null' + ? element.painScoreDesc.toString() : "-"; painLocation = element.painLocation.toString() != 'null' ? element.painLocation.toString() 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 e5f5abd0..ed39a86e 100644 --- a/lib/models/patient/vital_sign/patient-vital-sign-history.dart +++ b/lib/models/patient/vital_sign/patient-vital-sign-history.dart @@ -29,7 +29,7 @@ class VitalSignHistory { var status; bool isVitalsRequired; var patientID; - var createdOn; + var createdOn; var doctorID; var clinicID; var triageCategory; @@ -52,9 +52,9 @@ class VitalSignHistory { var bloodPressureCuffLocationDesc; var bloodPressureCuffSizeDesc; var bloodPressurePatientPositionDesc; - var clinicName; - var doctorImageURL; - var doctorName; + var clinicName; + var doctorImageURL; + var doctorName; var painScoreDesc; var pulseRhythmDesc; var respirationPatternDesc; diff --git a/lib/screens/patients/profile/vital_sign/vital_sign_detail_pain_scale.dart b/lib/screens/patients/profile/vital_sign/vital_sign_detail_pain_scale.dart index ffd8422d..146a8ddb 100644 --- a/lib/screens/patients/profile/vital_sign/vital_sign_detail_pain_scale.dart +++ b/lib/screens/patients/profile/vital_sign/vital_sign_detail_pain_scale.dart @@ -102,7 +102,7 @@ class VitalSignDetailPainScale extends StatelessWidget { child: Container( child: Center( child: AppText( - "${vitalList[index].painScore ?? "-"}", + "${vitalList[index].painScoreDesc ?? "-"}", fontWeight: FontWeight.w700, color: Color(0XFF28353E), fontSize: SizeConfig.textMultiplier * 1.3,