Merge branch 'roaa_prescription' into 'development'

Fixing update in update_note

See merge request Cloud_Solution/doctor_app_flutter!972

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) {

lib/screens/patients/profile/notes/note/update_note.dart

@@ -93,7 +93,7 @@ class _UpdateNoteOrderState extends State<UpdateNoteOrder> {
       progressNoteController.text = widget.note.notes;
       if(selectValue==null)
         selectValue={};
-        selectValue['ParameterCode'] = widget.note.condition;
+        selectValue[keyId] = widget.note.condition;
         selectValue['Description'] = widget.note.conditionDescription;
 
     }