From 04114623600a99b8dbd8ce8fdccc96660a2f011b Mon Sep 17 00:00:00 2001
From: hussam al-habibeh <hussamsameer95@gmail.com>
Date: Tue, 2 Mar 2021 15:42:13 +0200
Subject: [PATCH] update procedure for agreed categorise

---
 lib/core/viewModel/procedure_View_model.dart |  2 +-
 lib/screens/procedures/update-procedure.dart | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/core/viewModel/procedure_View_model.dart b/lib/core/viewModel/procedure_View_model.dart
index 199fa308..6af34f4d 100644
--- a/lib/core/viewModel/procedure_View_model.dart
+++ b/lib/core/viewModel/procedure_View_model.dart
@@ -99,6 +99,6 @@ class ProcedureViewModel extends BaseViewModel {
       setState(ViewState.ErrorLocal);
     } else
       setState(ViewState.Idle);
-    await getProcedure(mrn: mrn);
+    //await getProcedure(mrn: mrn);
   }
 }
diff --git a/lib/screens/procedures/update-procedure.dart b/lib/screens/procedures/update-procedure.dart
index f09157a2..312bdfe1 100644
--- a/lib/screens/procedures/update-procedure.dart
+++ b/lib/screens/procedures/update-procedure.dart
@@ -369,14 +369,16 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
     if (entityList.isNotEmpty) {
       entityList.forEach((element) {
         controls.add(
-          Controls(code: "remarks", controlValue: element.remarks ?? remarks),
+          Controls(code: "remarks", controlValue: element.remarks ?? ''),
         );
         controls.add(
           Controls(code: "ordertype", controlValue: '1'),
         );
 
         controlsProcedure.procedure = element.procedureId;
-        controlsProcedure.category = '0' + element.categoryID;
+        controlsProcedure.category = int.parse(element.categoryID) > 9
+            ? element.categoryID
+            : "0" + element.categoryID;
         controlsProcedure.controls = controls;
       });
     } else {
@@ -387,11 +389,12 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
       controls.add(
         Controls(code: "ordertype", controlValue: orderType),
       );
-    }
 
-    controlsProcedure.procedure = procedureId;
-    controlsProcedure.category = '0' + categorieId;
-    controlsProcedure.controls = controls;
+      controlsProcedure.procedure = procedureId;
+      controlsProcedure.category = '0' + categorieId;
+
+      controlsProcedure.controls = controls;
+    }
     // controlsProcedure.add(ProcedureDetail(
     //     category: categorieId, procedure: procedureId, controls: controls));
     updateProcedureReqModel.procedureDetail = controlsProcedure;
@@ -405,6 +408,7 @@ class _UpdateProcedureWidgetState extends State<UpdateProcedureWidget> {
       model.getProcedure(mrn: patient.patientMRN);
     } else if (model.state == ViewState.Idle) {
       DrAppToastMsg.showSuccesToast('procedure has been updated');
+      model.getProcedure(mrn: patient.patientMRN);
     }
   }