Merge branch 'roaa2.8_addnewmedicationservice' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into roaa2.8_addnewmedicationservice

lib/core/viewModel/profile/intervention_medication_view_model.dart

@@ -50,12 +50,12 @@ class InterventionMedicationViewModel extends BaseViewModel {
       toDate: "\/Date(1635886800000)\/",//AppDateUtils.convertDateToServerFormat(toDate),
     );
     hasError = false;
-    setState(ViewState.BusyLocal);
+    setState(ViewState.Busy);
     await _interventionMedicationService.getInterventionMedication(
         interventionMedicationReqModel: interventionMedicationReqModel);
     if (_interventionMedicationService.hasError) {
       error = _interventionMedicationService.error;
-      setState(ViewState.ErrorLocal);
+      setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }
@@ -78,13 +78,13 @@ class InterventionMedicationViewModel extends BaseViewModel {
       orderNo: 1171570, //orderNo,
     );
     hasError = false;
-    setState(ViewState.BusyLocal);
+    setState(ViewState.Busy);
     await _interventionMedicationService.getInterventionMedicationHistory(
         interventionMedicationHistoryReqModel:
             interventionMedicationHistoryReqModel);
     if (_interventionMedicationService.hasError) {
       error = _interventionMedicationService.error;
-      setState(ViewState.ErrorLocal);
+      setState(ViewState.Error);
     } else {
       setState(ViewState.Idle);
     }

lib/screens/patients/profile/pharmacy-intervention/intervention_medication_history_screen.dart

@@ -273,7 +273,7 @@ class _InterventionMedicationHistoryScreenState extends State<InterventionMedica
                                           onTap: () async {
 
                                             GifLoaderDialogUtils.showMyDialog(context);
-                                            model.setAcceptedOrRejected(
+                                            await model.setAcceptedOrRejected(
                                               remarks: "Rejected",
                                               memberId: model.allInterventionHistoryList[index].commentedBy,
                                               prescriptionNo: model.allInterventionHistoryList[index].prescriptionId,