From 48f67dc532864c04a5d1f70fd5e12e544dbf41c5 Mon Sep 17 00:00:00 2001
From: "taha.alam" <taha.alam@cloudsolutions.cpom.sa>
Date: Sun, 8 Dec 2024 11:01:37 +0300
Subject: [PATCH] WD: small changes regarding appointment id as null

---
 .../model/SOAP/assessment/patient_previous_diagnosis.dart  | 2 +-
 .../service/patient_medical_file/soap/SOAP_service.dart    | 2 +-
 .../assessment/widget/edit_diagnosis.dart                  | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart
index 63419958..99a50bf6 100644
--- a/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart
+++ b/lib/core/model/SOAP/assessment/patient_previous_diagnosis.dart
@@ -113,7 +113,7 @@ class PatientPreviousDiagnosis {
       'active': active,
       'admissionId': admissionId ?? 0,
       'admissionRequestId': admissionRequestId ?? 0,
-      'appointmentId': appointmentId,
+      'appointmentId': appointmentId ?? 0,
       'approvedBy': approvedBy,
       'approvedOn': approvedOn,
       'assessmentId': assessmentId ?? 0,
diff --git a/lib/core/service/patient_medical_file/soap/SOAP_service.dart b/lib/core/service/patient_medical_file/soap/SOAP_service.dart
index f20df2b0..1c40631e 100644
--- a/lib/core/service/patient_medical_file/soap/SOAP_service.dart
+++ b/lib/core/service/patient_medical_file/soap/SOAP_service.dart
@@ -1311,7 +1311,7 @@ class SOAPService extends LookupService {
       "patientId": diagnosis.patientId,
       "doctorId": diagnosis.doctorId,
       "pomrId": diagnosis.pomrId,
-      "appointmentId": diagnosis.appointmentId,
+      "appointmentId": diagnosis.appointmentId ?? 0,
       "problemId": diagnosis.problemId,
       "diagnosisType": diagnosis.diagnosisType,
       "setupId": await sharedPref.getString(DOCTOR_SETUP_ID)
diff --git a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
index 1ceea811..fd06b942 100644
--- a/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
+++ b/lib/screens/patients/profile/soap_update_vida_plus/assessment/widget/edit_diagnosis.dart
@@ -311,6 +311,7 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
                                     if (newValue != null)
                                       setState(() {
                                         selectedDiagnosisItem = newValue;
+                                        selectedDiagnosisItemValue = model.diagnosisTypeList[newValue];
                                       });
                                   },
                                   items:
@@ -459,6 +460,9 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
                                   filteredSearchController.text;
                               widget.diagnosis.remarks =
                                   remarksController.text;
+                              widget.diagnosis.condition = status;
+                              widget.diagnosis.diagnosisType =
+                                  selectedDiagnosisItemValue;
 
                               if(selectedDiagnosis != null ) {
                                 widget.diagnosis.selectedCategoryCode =
@@ -472,9 +476,6 @@ class _EditDiagnosisState extends State<EditDiagnosis> {
                                 widget.diagnosis.selectedSectionCode =
                                     selectedDiagnosis?.selectedSectionCode ??
                                         '';
-                                widget.diagnosis.condition = status;
-                                widget.diagnosis.diagnosisType =
-                                    selectedDiagnosisItem;
                               }
 
                               bool result =