From 9f7dbf5ec73428256dfd9474dcd56babfca972a6 Mon Sep 17 00:00:00 2001
From: RoaaGhali98 <ruaagh5656@outlook.com>
Date: Thu, 24 Feb 2022 11:28:25 +0200
Subject: [PATCH 1/2] Fixing update in update_note

---
 lib/screens/patients/profile/notes/note/update_note.dart | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/screens/patients/profile/notes/note/update_note.dart b/lib/screens/patients/profile/notes/note/update_note.dart
index be42eb59..cd5dc211 100644
--- a/lib/screens/patients/profile/notes/note/update_note.dart
+++ b/lib/screens/patients/profile/notes/note/update_note.dart
@@ -93,8 +93,8 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
       progressNoteController.text = widget.note.notes;
       if(selectValue==null)
         selectValue={};
-        selectValue['parameterCode'] = widget.note.condition;
-        selectValue['description'] = widget.note.conditionDescription;
+        selectValue[keyId] = widget.note.condition;
+        selectValue['Description'] = widget.note.conditionDescription;
 
     }
 

From e5fe12f26bd2293d6c7cd0e5b281a4f07176b668 Mon Sep 17 00:00:00 2001
From: RoaaGhali98 <ruaagh5656@outlook.com>
Date: Sun, 27 Feb 2022 08:53:05 +0200
Subject: [PATCH 2/2] Fixing some issues

---
 .../prescription/prescription_view_model.dart          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/core/viewModel/prescription/prescription_view_model.dart b/lib/core/viewModel/prescription/prescription_view_model.dart
index 3c2b38a6..e52f16ce 100644
--- a/lib/core/viewModel/prescription/prescription_view_model.dart
+++ b/lib/core/viewModel/prescription/prescription_view_model.dart
@@ -8,7 +8,6 @@ import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_entity_
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_model.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report.dart';
 import 'package:doctor_app_flutter/core/model/Prescriptions/prescription_report_enh.dart';
-import 'package:doctor_app_flutter/core/model/Prescriptions/prescriptions_order.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/GetAllergiesResModel.dart';
 import 'package:doctor_app_flutter/core/model/SOAP/GetAssessmentResModel.dart';
 import 'package:doctor_app_flutter/core/model/patient/patiant_info_model.dart';
@@ -96,9 +95,14 @@ class PrescriptionViewModel extends BaseViewModel {
       List<GetAssessmentResModel> lstAssessments,
       List<GetAllergiesResModel> allergy,
       PatiantInformtion patient,
-      List<dynamic> prescription) async {
+      List<dynamic> prescription,
+      {bool isLocalBusy = false}) async {
     hasError = false;
-    setState(ViewState.BusyLocal);
+    // setState(ViewState.BusyLocal);
+    if(isLocalBusy)
+      setState(ViewState.BusyLocal);
+    else
+      setState(ViewState.Busy);
     await _prescriptionService.getDrugToDrug(
         vital, lstAssessments, allergy, patient, prescription);
     if (_prescriptionService.hasError) {