From 9e7ca2ecf85651106fcde89947fe718714e1c193 Mon Sep 17 00:00:00 2001 From: Sultan khan <> Date: Tue, 1 Oct 2024 10:33:34 +0300 Subject: [PATCH] update assessment changes. --- .../diabetic_chart/GetDiabeticChartValuesResponseModel.dart | 2 +- .../soap_update/assessment/update_assessment_page.dart | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart index 1e5dd8fd..aa633671 100644 --- a/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart +++ b/lib/core/model/diabetic_chart/GetDiabeticChartValuesResponseModel.dart @@ -2,7 +2,7 @@ class GetDiabeticChartValuesResponseModel { String? resultType; int? admissionNo; String? dateChart; - int? resultValue; + num? resultValue; int? createdBy; String? createdOn; diff --git a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart index aa745578..65ceb4ff 100644 --- a/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart +++ b/lib/screens/patients/profile/soap_update/assessment/update_assessment_page.dart @@ -401,7 +401,9 @@ class _UpdateAssessmentPageState extends State implements } } bool checkPrimaryDiagnosis(){ - List type = mySelectedAssessmentList.where((element) => element.selectedDiagnosisType!.id==2).toList(); + ProjectViewModel projectViewModel = Provider.of(context, listen: false); + bool isVidaPlus = Utils.isVidaPlusProject(projectViewModel, widget.patientInfo.projectId!); + List type = mySelectedAssessmentList.where((element) => (element.selectedDiagnosisType!.id==2 && isVidaPlus ==false) || (element.selectedDiagnosisType!.code=='3' && isVidaPlus==true)).toList(); return type.isEmpty ? false : true; } }