primarycare-binder 1.1.4 → 1.1.8

package/dist/index.cjs.js

@@ -11654,8 +11654,6 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           //NURSE - completed_nurse
           //DOCTOR - completed
 
-          debugger;
-
           if (status === "completed_assemble") {
             encounterStatus = "checked-in";
           } else if (status === "inprogress_nurse") {
@@ -11671,11 +11669,11 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }
 
           if (!encounterStatus) {
-            _context14.next = 22;
+            _context14.next = 20;
             break;
           }
 
-          _context14.next = 9;
+          _context14.next = 8;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -11685,11 +11683,10 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
             })
           }, __readDocumentUrl__);
 
-        case 9:
+        case 8:
           encounterCode = _context14.sent;
-          debugger;
           encounterStatus = (_encounterCode$result = encounterCode === null || encounterCode === void 0 ? void 0 : (_encounterCode$result2 = encounterCode.result) === null || _encounterCode$result2 === void 0 ? void 0 : (_encounterCode$result3 = _encounterCode$result2[0]) === null || _encounterCode$result3 === void 0 ? void 0 : _encounterCode$result3._id) !== null && _encounterCode$result !== void 0 ? _encounterCode$result : "";
-          _context14.next = 14;
+          _context14.next = 12;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -11699,12 +11696,12 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
             })
           }, __readDocumentUrl__);
 
-        case 14:
+        case 12:
           encounterInfo = _context14.sent;
           _ref30 = (encounterInfo === null || encounterInfo === void 0 ? void 0 : (_encounterInfo$result = encounterInfo.result) === null || _encounterInfo$result === void 0 ? void 0 : _encounterInfo$result[0]) || {}, _id = _ref30._id, _key = _ref30._key, statushistory = _ref30.statushistory;
 
           if (!(_id && _key && statushistory && Array.isArray(statushistory))) {
-            _context14.next = 22;
+            _context14.next = 20;
             break;
           }
 
@@ -11741,12 +11738,12 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               status: encounterStatus
             }
           }];
-          _context14.next = 22;
+          _context14.next = 20;
           return fetchData$3({
             body: JSON.stringify(updateData)
           }, __uspsertUrl__);
 
-        case 22:
+        case 20:
           // const appData = await fetchData({
           //   body: JSON.stringify(appBody),
           // });
@@ -11757,7 +11754,6 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }
 
           appInfo["comment"] = status;
-          debugger;
           body = [{
             db_name: dbName,
             entity: "Appointment",
@@ -11768,30 +11764,30 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               id: appointmentId
             }
           }];
-          _context14.next = 29;
+          _context14.next = 26;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
-        case 29:
+        case 26:
           data = _context14.sent;
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
-        case 33:
-          _context14.prev = 33;
+        case 30:
+          _context14.prev = 30;
           _context14.t0 = _context14["catch"](2);
           return _context14.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context14.t0.message
           })));
 
-        case 36:
+        case 33:
         case "end":
           return _context14.stop();
       }
     }
-  }, _callee14, null, [[2, 33]]);
+  }, _callee14, null, [[2, 30]]);
 })));
 var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApoointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
   var payload,
@@ -18137,7 +18133,7 @@ var dashboardQuery = {
         entity: "Practitioner,Encounter",
         filter: {
           Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].display ANY =='Consultation Over' collect with count into length")
+          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{Finished:length}"
       } // 3: {},
@@ -18488,7 +18484,7 @@ var visitQuery = {
         entity: "Practitioner,Encounter",
         filter: {
           Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id ==".concat(orgId, "  && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].display ANY =='Consultation Over' collect with count into length")
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id ==".concat(orgId, "  && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{CompletedCount:length}"
       },
@@ -18497,14 +18493,14 @@ var visitQuery = {
         entity: "Practitioner,Encounter",
         filter: {
           Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<= ").concat(endDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].display ANY =='Consultation Over' collect with count into length")
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<= ").concat(endDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{CompletedCount:length}"
       },
       3: {
         db_name: dbName,
         entity: "Encounter",
-        filter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].display ANY =='Consultation Over' collect with count into length"),
+        filter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length"),
         return_fields: "{CompletedCount:length}"
       }
     };
@@ -18559,7 +18555,7 @@ var highPriorityPatientQuery = {
       1: {
         db_name: "primarycare",
         entity: "Encounter",
-        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high' AND (lower(DOCUMENT(Encounter.status).display)==lower('Triaged') or lower(DOCUMENT(Encounter.status).display)==lower('in-progress')) "),
+        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high'"),
         return_fields: "MERGE(Encounter,{patient_id:(FOR pat IN Patient FILTER pat.id==Encounter.patient_id RETURN MERGE(pat,{name:(FOR hn IN TO_ARRAY(pat.name) RETURN DOCUMENT(hn)),photo:(FOR ph IN TO_ARRAY(pat.photo) RETURN DOCUMENT(ph))})),priority:DOCUMENT(Encounter.priority),priorityreason:DOCUMENT(Encounter.priorityreason)},{appointmentId:(for app in Appointment filter app.id in Encounter.appointmentId return app)},{reasonReference:document(Encounter.reasonReference)})"
       },
       2: {
@@ -18704,24 +18700,23 @@ var TODAY_SCHEDULE = createAsyncThunk("dashboardApiSlice/today_schedul", /*#__PU
             });
           }
 
-          debugger;
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: arr
           }));
 
-        case 13:
-          _context2.prev = 13;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](2);
           return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context2.t0.message
           })));
 
-        case 16:
+        case 15:
         case "end":
           return _context2.stop();
       }
     }
-  }, _callee2, null, [[2, 13]]);
+  }, _callee2, null, [[2, 12]]);
 })));
 var PATIENT_WAITING_TIME = createAsyncThunk("dashboardApiSlice/patientWaitingTime", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
   var payload,
@@ -18761,25 +18756,24 @@ var PATIENT_WAITING_TIME = createAsyncThunk("dashboardApiSlice/patientWaitingTim
 
         case 6:
           data = _context3.sent;
-          debugger;
           arr = [(_data$0$LessThan15$0$ = data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$LessThan = _data$.LessThan15) === null || _data$$LessThan === void 0 ? void 0 : (_data$$LessThan$ = _data$$LessThan[0]) === null || _data$$LessThan$ === void 0 ? void 0 : _data$$LessThan$.LessThan15) !== null && _data$0$LessThan15$0$ !== void 0 ? _data$0$LessThan15$0$ : 0, (_data$0$MoreThan15$0$ = data === null || data === void 0 ? void 0 : (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$MoreThan = _data$2.MoreThan15) === null || _data$2$MoreThan === void 0 ? void 0 : (_data$2$MoreThan$ = _data$2$MoreThan[0]) === null || _data$2$MoreThan$ === void 0 ? void 0 : _data$2$MoreThan$.MoreThan15) !== null && _data$0$MoreThan15$0$ !== void 0 ? _data$0$MoreThan15$0$ : 0, (_data$0$GreaterThan = data === null || data === void 0 ? void 0 : (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$GreaterThan = _data$3.GreaterThan30) === null || _data$3$GreaterThan === void 0 ? void 0 : (_data$3$GreaterThan$ = _data$3$GreaterThan[0]) === null || _data$3$GreaterThan$ === void 0 ? void 0 : _data$3$GreaterThan$.GreaterThan30) !== null && _data$0$GreaterThan !== void 0 ? _data$0$GreaterThan : 0];
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: arr
           }));
 
-        case 12:
-          _context3.prev = 12;
+        case 11:
+          _context3.prev = 11;
           _context3.t0 = _context3["catch"](2);
           return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context3.t0.message
           })));
 
-        case 15:
+        case 14:
         case "end":
           return _context3.stop();
       }
     }
-  }, _callee3, null, [[2, 12]]);
+  }, _callee3, null, [[2, 11]]);
 })));
 var PATIENTSTATUSASSESSMENTPENDING = createAsyncThunk("dashboardApiSlice/patientStatusAssessmentPendin", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
   var payload,
@@ -19051,34 +19045,32 @@ var TODAY_VISIT = createAsyncThunk("dashboardApiSlice/today_visit", /*#__PURE__*
           _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue;
           _context9.prev = 2;
           orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgIdInt = payload.orgIdInt;
-          debugger;
-          _context9.next = 7;
+          _context9.next = 6;
           return fetchData$3({
             body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgIdInt, loginId)[roleId])
           }, __readDocumentUrl__);
 
-        case 7:
+        case 6:
           data = _context9.sent;
-          debugger;
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
               count: (_data$result$0$Checke2 = data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : (_data$result2$ = _data$result2[0]) === null || _data$result2$ === void 0 ? void 0 : _data$result2$.CheckedIn) !== null && _data$result$0$Checke2 !== void 0 ? _data$result$0$Checke2 : 0
             }
           }));
 
-        case 12:
-          _context9.prev = 12;
+        case 10:
+          _context9.prev = 10;
           _context9.t0 = _context9["catch"](2);
           return _context9.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context9.t0.message
           })));
 
-        case 15:
+        case 13:
         case "end":
           return _context9.stop();
       }
     }
-  }, _callee9, null, [[2, 12]]);
+  }, _callee9, null, [[2, 10]]);
 })));
 var OTHER_VISIT_COUNT = createAsyncThunk("dashboardApiSlice/runquery", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
   var payload,
@@ -24595,10 +24587,10 @@ var queries$7 = {
     //     "return_fields": "CA_AllergyIntolerance"
     // }
     return {
-      db_name: "primarycare",
+      db_name: dbName,
       entity: "CA_AllergyIntolerance",
       filter: "CA_AllergyIntolerance.encounter_id=='".concat(encounter_id, "'"),
-      return_fields: " MERGE(CA_AllergyIntolerance,{statushistory: (FOR sths IN TO_ARRAY(CA_AllergyIntolerance.statushistory) RETURN MERGE(sths,{PersonID:(FOR hn IN DOCUMENT(sths.PersonID).name RETURN MERGE(DOCUMENT(sths.PersonID),{name:DOCUMENT(hn)}))}))},{practitioner_id:(for prac in Practitioner filter prac._id == CA_AllergyIntolerance.practitioner_id return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for us in CodeableConceptMaster filter us._id == nam.use return merge(us,{coding:document(us.coding)}))},{prefix:(for pre in CodeableConceptMaster filter pre._id == nam.prefix return merge(pre,{coding:document(pre.coding)}))},{suffix:(for suf in CodeableConceptMaster filter suf._id == nam.suffix return merge(suf,{coding:document(suf.coding)}))}))}))})"
+      return_fields: " MERGE(CA_AllergyIntolerance,{statushistory: (FOR sths IN TO_ARRAY(CA_AllergyIntolerance.statushistory) RETURN MERGE(sths,{PersonID:(FOR hn IN DOCUMENT(sths.PersonID).name RETURN MERGE(DOCUMENT(sths.PersonID),{name:DOCUMENT(hn)}))}))},{practitioner_id:(for prac in Practitioner filter prac._id == CA_AllergyIntolerance.practitioner_id return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for us in CodeableConceptMaster filter us._id == nam.use return merge(us,{coding:document(us.coding)}))},{prefix:(for pre in CodeableConceptMaster filter pre._id == nam.prefix return merge(pre,{coding:document(pre.coding)}))},{suffix:(for suf in CodeableConceptMaster filter suf._id == nam.suffix return merge(suf,{coding:document(suf.coding)}))}))}))},{code:keep(document(CA_AllergyIntolerance.code),'_id','longdesc','id','code','_key')})"
     };
   },
   reactionMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='ALREACTIONCODE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n    }"),
@@ -24620,7 +24612,7 @@ var queries$7 = {
       filter: {
         CA_AllergyIntolerance: "CA_AllergyIntolerance.patient_id=='".concat(patientId, "'")
       },
-      return_fields: " MERGE(CA_AllergyIntolerance, {practitioner_id: (FOR hn IN TO_ARRAY(DOCUMENT(CA_AllergyIntolerance.practitioner_id).name) RETURN MERGE(DOCUMENT(CA_AllergyIntolerance.practitioner_id), {name:DOCUMENT(hn)})) }, {statushistory: (FOR sths IN TO_ARRAY(CA_AllergyIntolerance.statushistory) RETURN MERGE(sths,{PersonID:(FOR hn IN DOCUMENT(sths.PersonID).name RETURN MERGE(DOCUMENT(sths.PersonID),{name:DOCUMENT(hn)}))}))})"
+      return_fields: " MERGE(CA_AllergyIntolerance, {practitioner_id: (FOR hn IN TO_ARRAY(DOCUMENT(CA_AllergyIntolerance.practitioner_id).name) RETURN MERGE(DOCUMENT(CA_AllergyIntolerance.practitioner_id), {name:DOCUMENT(hn)})) }, {statushistory: (FOR sths IN TO_ARRAY(CA_AllergyIntolerance.statushistory) RETURN MERGE(sths,{PersonID:(FOR hn IN DOCUMENT(sths.PersonID).name RETURN MERGE(DOCUMENT(sths.PersonID),{name:DOCUMENT(hn)}))}))},{code:keep(document(CA_AllergyIntolerance.code),'_id','longdesc','id','code','_key')})"
     };
   }
 };
@@ -24794,7 +24786,7 @@ var generateJSON$3 = function generateJSON(data) {
 
 var generateResJson$4 = function generateResJson(dataList, state) {
   var list = dataList.map(function (data) {
-    var _data$code, _data$category, _data$category2, _data$clinicalstatus, _data$lastoccurrence, _data$lastoccurrence$, _data$lastoccurrence2, _data$lastoccurrence3, _data$lastoccurrence4, _data$lastoccurrence5, _data$lastoccurrence6, _data$lastoccurrence7, _data$lastoccurrence8, _data$lastoccurrence9, _data$lastoccurrence10, _data$lastoccurrence11, _data$lastoccurrence12, _data$lastoccurrence13, _data$lastoccurrence14, _data$lastoccurrence15, _data$lastoccurrence16, _data$lastoccurrence17, _data$lastoccurrence18, _data$lastoccurrence19, _data$lastoccurrence20, _data$lastoccurrence21, _data$note, _data$onset, _data$onset$, _data$onset2, _data$onset2$, _data$onset3, _data$onset3$, _data$onset4, _data$onset4$, _data$onset5, _data$onset5$, _data$onset6, _data$onset6$, _data$onset7, _data$onset7$, _data$onset8, _data$onset8$, _data$onset9, _data$onset9$, _data$onset10, _data$onset10$, _data$onset11, _data$onset11$, _data$relationName, _data$criticality, _data$type, _data$verificationsta, _data$reaction, _data$createddate;
+    var _data$code, _data$code2, _data$category, _data$category2, _data$clinicalstatus, _data$lastoccurrence, _data$lastoccurrence$, _data$lastoccurrence2, _data$lastoccurrence3, _data$lastoccurrence4, _data$lastoccurrence5, _data$lastoccurrence6, _data$lastoccurrence7, _data$lastoccurrence8, _data$lastoccurrence9, _data$lastoccurrence10, _data$lastoccurrence11, _data$lastoccurrence12, _data$lastoccurrence13, _data$lastoccurrence14, _data$lastoccurrence15, _data$lastoccurrence16, _data$lastoccurrence17, _data$lastoccurrence18, _data$lastoccurrence19, _data$lastoccurrence20, _data$lastoccurrence21, _data$note, _data$onset, _data$onset$, _data$onset2, _data$onset2$, _data$onset3, _data$onset3$, _data$onset4, _data$onset4$, _data$onset5, _data$onset5$, _data$onset6, _data$onset6$, _data$onset7, _data$onset7$, _data$onset8, _data$onset8$, _data$onset9, _data$onset9$, _data$onset10, _data$onset10$, _data$onset11, _data$onset11$, _data$relationName, _data$criticality, _data$type, _data$verificationsta, _data$reaction, _data$createddate;
 
     // let clicnicalstatushistory = val?.clicnicalstatushistory?.map(val => {
     //     return {
@@ -24804,7 +24796,10 @@ var generateResJson$4 = function generateResJson(dataList, state) {
     //     }
     // })
     return {
-      "allergenCode": (_data$code = data === null || data === void 0 ? void 0 : data.code) !== null && _data$code !== void 0 ? _data$code : null,
+      "allergenCode": {
+        label: data === null || data === void 0 ? void 0 : (_data$code = data.code) === null || _data$code === void 0 ? void 0 : _data$code.longdesc,
+        value: data === null || data === void 0 ? void 0 : (_data$code2 = data.code) === null || _data$code2 === void 0 ? void 0 : _data$code2._id
+      },
       "asserted": (_data$category = data === null || data === void 0 ? void 0 : data.category) !== null && _data$category !== void 0 ? _data$category : null,
       "category": (_data$category2 = data === null || data === void 0 ? void 0 : data.category) !== null && _data$category2 !== void 0 ? _data$category2 : null,
       "clinicalStatus": (_data$clinicalstatus = data === null || data === void 0 ? void 0 : data.clinicalstatus) !== null && _data$clinicalstatus !== void 0 ? _data$clinicalstatus : null,
@@ -25987,7 +25982,7 @@ var queries$6 = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})" // db_name: `${dbName}`,
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})" // db_name: `${dbName}`,
       // entity: "CA_OrderLine",
       // filter: `CA_OrderLine.encounter_Id=="${encounter_id}" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=="${order_id}" && CA_OrderLine.activestatus==true`,
       // filter: `CA_OrderLine.encounter_Id=="${encounter_id}" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true`,
@@ -26064,7 +26059,7 @@ var queries$6 = {
 
 var generateResJson$3 = function generateResJson(dataList, arr) {
   var list = dataList.map(function (val) {
-    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor10$$pra3, _val$specimenRelated$, _val$specimenRelated$2, _val$specimenRelated$3, _val$specimenRelated$4, _val$specimenRelated$5, _val$specimenRelated$6, _val$specimenRelated$7, _val$specimenRelated$8, _val$specimenRelated$9, _val$specimenRelated$10, _val$specimenRelated$11, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
+    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$pra, _val$Requestor11$$pra2, _val$Requestor11$$pra3, _val$specimenRelated$, _val$specimenRelated$2, _val$specimenRelated$3, _val$specimenRelated$4, _val$specimenRelated$5, _val$specimenRelated$6, _val$specimenRelated$7, _val$specimenRelated$8, _val$specimenRelated$9, _val$specimenRelated$10, _val$specimenRelated$11, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis = val.diagnosis) === null || _val$diagnosis === void 0 ? void 0 : _val$diagnosis.map(function (v) {
       return {
@@ -26157,7 +26152,8 @@ var generateResJson$3 = function generateResJson(dataList, arr) {
         practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor8 = val.Requestor) === null || _val$Requestor8 === void 0 ? void 0 : (_val$Requestor8$ = _val$Requestor8[0]) === null || _val$Requestor8$ === void 0 ? void 0 : (_val$Requestor8$$prac = _val$Requestor8$.practId) === null || _val$Requestor8$$prac === void 0 ? void 0 : (_val$Requestor8$$prac2 = _val$Requestor8$$prac[0]) === null || _val$Requestor8$$prac2 === void 0 ? void 0 : (_val$Requestor8$$prac3 = _val$Requestor8$$prac2.name) === null || _val$Requestor8$$prac3 === void 0 ? void 0 : _val$Requestor8$$prac3[0],
         orderBy: {
           value: val === null || val === void 0 ? void 0 : (_val$Requestor9 = val.Requestor) === null || _val$Requestor9 === void 0 ? void 0 : (_val$Requestor9$ = _val$Requestor9[0]) === null || _val$Requestor9$ === void 0 ? void 0 : (_val$Requestor9$$prac = _val$Requestor9$.practId) === null || _val$Requestor9$$prac === void 0 ? void 0 : (_val$Requestor9$$prac2 = _val$Requestor9$$prac[0]) === null || _val$Requestor9$$prac2 === void 0 ? void 0 : _val$Requestor9$$prac2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : (_val$Requestor10$$pra3 = _val$Requestor10$$pra2.name) === null || _val$Requestor10$$pra3 === void 0 ? void 0 : _val$Requestor10$$pra3[0]) || {})
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : _val$Requestor10$$pra2.practitioner_id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$pra = _val$Requestor11$.practId) === null || _val$Requestor11$$pra === void 0 ? void 0 : (_val$Requestor11$$pra2 = _val$Requestor11$$pra[0]) === null || _val$Requestor11$$pra2 === void 0 ? void 0 : (_val$Requestor11$$pra3 = _val$Requestor11$$pra2.name) === null || _val$Requestor11$$pra3 === void 0 ? void 0 : _val$Requestor11$$pra3[0]) || {})
         }
       },
       indication: {
@@ -26239,7 +26235,7 @@ var RecurrentgenerateResJson$2 = function RecurrentgenerateResJson(dataList, arr
     return el != null;
   });
   var list = dataList.map(function (val) {
-    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$org, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor$0$prac3, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$pra, _val$Requestor$0$prac4, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor18$$pra2, _val$Requestor18$$pra3, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor20$$pra3, _val$specimenRelated, _val$specimenRelated$12, _val$specimenRelated2, _val$specimenRelated3, _val$specimenRelated4, _val$specimenRelated5, _val$specimenRelated6, _val$specimenRelated7, _val$specimenRelated8, _val$specimenRelated9, _val$specimenRelated10, _val$specimenRelated11, _val$specimenRelated12, _val$specimenRelated13, _val$specimenRelated14, _val$specimenRelated15, _val$specimenRelated16, _val$specimenRelated17, _val$specimenRelated18, _val$specimenRelated19, _val$specimenRelated20, _val$specimenRelated21, _val$specimenRelated22, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
+    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$org, _val$Requestor$0$prac3, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor$0$prac4, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor19$$pra3, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor21, _val$Requestor21$, _val$Requestor21$$pra, _val$Requestor21$$pra2, _val$Requestor22, _val$Requestor22$, _val$Requestor22$$pra, _val$Requestor22$$pra2, _val$Requestor22$$pra3, _val$specimenRelated, _val$specimenRelated$12, _val$specimenRelated2, _val$specimenRelated3, _val$specimenRelated4, _val$specimenRelated5, _val$specimenRelated6, _val$specimenRelated7, _val$specimenRelated8, _val$specimenRelated9, _val$specimenRelated10, _val$specimenRelated11, _val$specimenRelated12, _val$specimenRelated13, _val$specimenRelated14, _val$specimenRelated15, _val$specimenRelated16, _val$specimenRelated17, _val$specimenRelated18, _val$specimenRelated19, _val$specimenRelated20, _val$specimenRelated21, _val$specimenRelated22, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis2 = val.diagnosis) === null || _val$diagnosis2 === void 0 ? void 0 : _val$diagnosis2.map(function (v) {
       return {
@@ -26318,20 +26314,21 @@ var RecurrentgenerateResJson$2 = function RecurrentgenerateResJson(dataList, arr
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
         organization: {
-          label: val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$org = _val$Requestor11$.organization) === null || _val$Requestor11$$org === void 0 ? void 0 : _val$Requestor11$$org._id,
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org.name,
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.id
+          label: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org._id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.name,
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$org = _val$Requestor14$.organization) === null || _val$Requestor14$$org === void 0 ? void 0 : _val$Requestor14$$org.id
         },
         practitionerRole: {
-          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$pra = _val$Requestor14$.practRole) === null || _val$Requestor14$$pra === void 0 ? void 0 : _val$Requestor14$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
-          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.id,
-          _id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra._id
+          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
+          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra.id,
+          _id: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practRole) === null || _val$Requestor18$$pra === void 0 ? void 0 : _val$Requestor18$$pra._id
         },
-        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practId) === null || _val$Requestor18$$pra === void 0 ? void 0 : (_val$Requestor18$$pra2 = _val$Requestor18$$pra[0]) === null || _val$Requestor18$$pra2 === void 0 ? void 0 : (_val$Requestor18$$pra3 = _val$Requestor18$$pra2.name) === null || _val$Requestor18$$pra3 === void 0 ? void 0 : _val$Requestor18$$pra3[0],
+        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : (_val$Requestor19$$pra3 = _val$Requestor19$$pra2.name) === null || _val$Requestor19$$pra3 === void 0 ? void 0 : _val$Requestor19$$pra3[0],
         orderBy: {
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : _val$Requestor19$$pra2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : (_val$Requestor20$$pra3 = _val$Requestor20$$pra2.name) === null || _val$Requestor20$$pra3 === void 0 ? void 0 : _val$Requestor20$$pra3[0]) || {})
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : _val$Requestor20$$pra2.id,
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor21 = val.Requestor) === null || _val$Requestor21 === void 0 ? void 0 : (_val$Requestor21$ = _val$Requestor21[0]) === null || _val$Requestor21$ === void 0 ? void 0 : (_val$Requestor21$$pra = _val$Requestor21$.practId) === null || _val$Requestor21$$pra === void 0 ? void 0 : (_val$Requestor21$$pra2 = _val$Requestor21$$pra[0]) === null || _val$Requestor21$$pra2 === void 0 ? void 0 : _val$Requestor21$$pra2.practitioner_id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor22 = val.Requestor) === null || _val$Requestor22 === void 0 ? void 0 : (_val$Requestor22$ = _val$Requestor22[0]) === null || _val$Requestor22$ === void 0 ? void 0 : (_val$Requestor22$$pra = _val$Requestor22$.practId) === null || _val$Requestor22$$pra === void 0 ? void 0 : (_val$Requestor22$$pra2 = _val$Requestor22$$pra[0]) === null || _val$Requestor22$$pra2 === void 0 ? void 0 : (_val$Requestor22$$pra3 = _val$Requestor22$$pra2.name) === null || _val$Requestor22$$pra3 === void 0 ? void 0 : _val$Requestor22$$pra3[0]) || {})
         }
       },
       indication: {
@@ -27725,12 +27722,13 @@ var LABORDER_ORGANIZATION = createAsyncThunk("LabOrderApiSlice/laborder_orgnniza
           data3 = _context23.sent;
           arr3 = [];
           data3 === null || data3 === void 0 ? void 0 : (_data3$result = data3.result) === null || _data3$result === void 0 ? void 0 : _data3$result.map(function (val) {
-            var _val$shortdesc, _val$shortdesc2, _val$_id6;
+            var _val$shortdesc, _val$shortdesc2, _val$_id6, _val$locationID;
 
             arr3.push({
               label: (_val$shortdesc = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc !== void 0 ? _val$shortdesc : "",
               value: (_val$shortdesc2 = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc2 !== void 0 ? _val$shortdesc2 : "",
-              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : ""
+              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : "",
+              locationID: (_val$locationID = val === null || val === void 0 ? void 0 : val.locationID) !== null && _val$locationID !== void 0 ? _val$locationID : ""
             });
           });
           _context23.next = 26;
@@ -27802,7 +27800,7 @@ var ORDER_TYPE_REQ_DETAILS_LAB = createAsyncThunk("LabOrderApiSlice/order_type_r
           data2 = _context24.sent;
           arr2 = [];
           data2 === null || data2 === void 0 ? void 0 : (_data2$result2 = data2.result) === null || _data2$result2 === void 0 ? void 0 : _data2$result2.map(function (val) {
-            var _val$name2, _val$_id7;
+            var _val$name2, _val$_id7, _val$practitioner_id;
 
             // if (
             // 	val.name[0]?.prefix[0]?.coding.display +
@@ -27811,7 +27809,8 @@ var ORDER_TYPE_REQ_DETAILS_LAB = createAsyncThunk("LabOrderApiSlice/order_type_r
             // ) {
             arr2.push({
               label: makeName((val === null || val === void 0 ? void 0 : (_val$name2 = val.name) === null || _val$name2 === void 0 ? void 0 : _val$name2[0]) || {}),
-              value: (_val$_id7 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id7 !== void 0 ? _val$_id7 : ""
+              value: (_val$_id7 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id7 !== void 0 ? _val$_id7 : "",
+              practitioner_id: (_val$practitioner_id = val === null || val === void 0 ? void 0 : val.practitioner_id) !== null && _val$practitioner_id !== void 0 ? _val$practitioner_id : ""
             }); // }
           });
           return _context24.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -28577,7 +28576,7 @@ var LabOrderApiSlice$1 = LabOrderApiSlice.reducer;
 
 var queries$5 = {
   drugType: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugType\",\n        \"return_fields\": \"DrugType\"\n    }"),
-  drugMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})\"\n    }"),
+  drugMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"limit\":{\n          \"count\":100,\n          \"offset\":0\n          \n          },\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})\"\n    }"),
   getMedications: function getMedications(id) {
     return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"filter\": \"PH_OrderLine.patient_Id=='").concat(id, "'\",\n        \"entity\": \"PH_OrderLine\",\n        \"return_fields\": \"MERGE(PH_OrderLine, { patient_Id:(FOR pname IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).name) RETURN MERGE(DOCUMENT(PH_OrderLine.patient_Id), { name:DOCUMENT(pname), telecom:(FOR ptel IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).telecom) RETURN DOCUMENT(ptel)), martialStatus:(FOR mstatus IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).martialStatus) RETURN DOCUMENT(mstatus)) } ) ) ,org_Id:MERGE(DOCUMENT(PH_OrderLine.org_Id), { telecom:(FOR otel IN TO_ARRAY(DOCUMENT(PH_OrderLine.org_Id).telecom) RETURN DOCUMENT(otel) ), address:(FOR oadd IN TO_ARRAY(DOCUMENT(PH_OrderLine.org_Id).address) RETURN DOCUMENT(oadd) ) }) ,encounter_Id:DOCUMENT(PH_OrderLine.encounter_Id) ,dosageDurationUOM:DOCUMENT(PH_OrderLine.dosageDurationUOM) ,dosageFreqCode:DOCUMENT(PH_OrderLine.dosageFreqCode) ,dosageUOM:DOCUMENT(PH_OrderLine.dosageUOM) ,drugCode:DOCUMENT(PH_OrderLine.drugCode) ,drugType:DOCUMENT(PH_OrderLine.drugType) , createdby:(FOR hn IN TO_ARRAY(DOCUMENT(PH_OrderLine.createdby).name) RETURN MERGE(DOCUMENT(PH_OrderLine.createdby),{name:DOCUMENT(hn)})) , updatedby:(FOR hn IN TO_ARRAY(DOCUMENT(PH_OrderLine.updatedby).name) RETURN MERGE(DOCUMENT(PH_OrderLine.updatedby),{name:DOCUMENT(hn)})) , statushistory:(FOR sth IN TO_ARRAY(PH_OrderLine.statushistory) RETURN MERGE(sth,{PersonID:(FOR hn IN TO_ARRAY(DOCUMENT(sth.PersonID).name) RETURN MERGE(DOCUMENT(sth.PersonID),{name:DOCUMENT(hn)}))})) } )\"\n    }");
   },
@@ -28648,6 +28647,25 @@ var queries$5 = {
 //     }
 //   ]
 
+var codeQuery = {
+  AllergyCodes: function AllergyCodes(list) {
+    return {
+      db_name: dbName,
+      entity: "CA_AllergyIntolerance",
+      filter: "CA_AllergyIntolerance.encounter_id=='".concat(list, "' && CA_AllergyIntolerance.activestatus==true"),
+      "return_fields": "{code:document(CA_AllergyIntolerance.code)}"
+    };
+  },
+  DrugCodes: function DrugCodes(list) {
+    return {
+      db_name: dbName,
+      entity: "CA_Diagnosis",
+      filter: "CA_Diagnosis.encounter_id=='".concat(list, "' && CA_Diagnosis.activestatus==true"),
+      return_fields: "{diagcode:document(CA_Diagnosis.diagcode)}"
+    };
+  }
+};
+
 var _extraReducers$g;
 var DRUGTYPE_MASTER = createAsyncThunk("MedicationMastersSlice/drugType_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
@@ -28723,7 +28741,7 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
           data = _context2.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2;
+            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2, _val$DrugType3, _val$DrugType4, _val$drugroutegenid;
 
             var json = {
               value: val === null || val === void 0 ? void 0 : val._id,
@@ -28733,7 +28751,10 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
               StrengthValues: val === null || val === void 0 ? void 0 : (_val$StrengthValuesPo = val.StrengthValuesPossible) === null || _val$StrengthValuesPo === void 0 ? void 0 : (_val$StrengthValuesPo2 = _val$StrengthValuesPo[0]) === null || _val$StrengthValuesPo2 === void 0 ? void 0 : _val$StrengthValuesPo2.StrengthValue,
               StrengthUOM: val === null || val === void 0 ? void 0 : (_val$StrengthValuesPo3 = val.StrengthValuesPossible) === null || _val$StrengthValuesPo3 === void 0 ? void 0 : (_val$StrengthValuesPo4 = _val$StrengthValuesPo3[0]) === null || _val$StrengthValuesPo4 === void 0 ? void 0 : _val$StrengthValuesPo4.StrengthUOM,
               drugType: val === null || val === void 0 ? void 0 : (_val$DrugType = val.DrugType) === null || _val$DrugType === void 0 ? void 0 : _val$DrugType.drugtype,
-              drugTypeId: val === null || val === void 0 ? void 0 : (_val$DrugType2 = val.DrugType) === null || _val$DrugType2 === void 0 ? void 0 : _val$DrugType2._id // formValue
+              drugTypeLong: val === null || val === void 0 ? void 0 : (_val$DrugType2 = val.DrugType) === null || _val$DrugType2 === void 0 ? void 0 : _val$DrugType2.longdesc,
+              drugTypeShort: val === null || val === void 0 ? void 0 : (_val$DrugType3 = val.DrugType) === null || _val$DrugType3 === void 0 ? void 0 : _val$DrugType3.shortdesc,
+              drugTypeId: val === null || val === void 0 ? void 0 : (_val$DrugType4 = val.DrugType) === null || _val$DrugType4 === void 0 ? void 0 : _val$DrugType4._id,
+              drugroutegenid: (_val$drugroutegenid = val === null || val === void 0 ? void 0 : val.drugroutegenid) !== null && _val$drugroutegenid !== void 0 ? _val$drugroutegenid : "" // formValue
 
             };
             arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
@@ -30589,18 +30610,13 @@ var MedicationMastersActions = {
 var MedicationMastersSlice$1 = MedicationMastersSlice.reducer;
 
 var _extraReducers$f;
-var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+var ALERT_CODES = createAsyncThunk("medicationsSlice/alert_codes", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
       _ref2,
       rejectWithValue,
-      _data$Result,
-      _data$Result$,
-      _data$Result$$propert,
-      _data$Result$$propert2,
       list,
-      orgData,
-      body,
       data,
+      code,
       _args = arguments;
 
   return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -30610,44 +30626,143 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          list = payload;
+          list = payload.list;
           _context.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(codeQuery.AllergyCodes(list))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context.sent;
+          code = data.result.map(function (val) {
+            return {
+              codes: val.code.code
+            };
+          });
+          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: code
+          }));
+
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](2);
+          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context.t0.message
+          })));
+
+        case 14:
+        case "end":
+          return _context.stop();
+      }
+    }
+  }, _callee, null, [[2, 11]]);
+})));
+var DRUG_CODES = createAsyncThunk("medicationsSlice/drug_codes", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+  var payload,
+      _ref4,
+      rejectWithValue,
+      list,
+      data,
+      code,
+      _args2 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    while (1) {
+      switch (_context2.prev = _context2.next) {
+        case 0:
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
+          _context2.prev = 2;
+          list = payload.list;
+          _context2.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(codeQuery.DrugCodes(list))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context2.sent;
+          code = data.result.map(function (val) {
+            return {
+              codes: val.diagcode.icdcode
+            };
+          });
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: code
+          }));
+
+        case 11:
+          _context2.prev = 11;
+          _context2.t0 = _context2["catch"](2);
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context2.t0.message
+          })));
+
+        case 14:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _callee2, null, [[2, 11]]);
+})));
+var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+  var payload,
+      _ref6,
+      rejectWithValue,
+      _data$Result,
+      _data$Result$,
+      _data$Result$$propert,
+      _data$Result$$propert2,
+      list,
+      orgData,
+      body,
+      data,
+      _args3 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee3$(_context3) {
+    while (1) {
+      switch (_context3.prev = _context3.next) {
+        case 0:
+          payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
+          _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
+          _context3.prev = 2;
+          list = payload;
+          _context3.next = 6;
           return fetchData$3({
             body: queries$5.getOrganizationId(payload.orgId)
           }, __readDocumentUrl__);
 
         case 6:
-          orgData = _context.sent;
+          orgData = _context3.sent;
           body = generateJSON$4(list, orgData.result[0]);
-          _context.next = 10;
+          _context3.next = 10;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
         case 10:
-          data = _context.sent;
-          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context3.sent;
+          return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data === null || data === void 0 ? void 0 : (_data$Result = data.Result) === null || _data$Result === void 0 ? void 0 : (_data$Result$ = _data$Result[0]) === null || _data$Result$ === void 0 ? void 0 : (_data$Result$$propert = _data$Result$.properties) === null || _data$Result$$propert === void 0 ? void 0 : (_data$Result$$propert2 = _data$Result$$propert.doc) === null || _data$Result$$propert2 === void 0 ? void 0 : _data$Result$$propert2._id
           }));
 
         case 14:
-          _context.prev = 14;
-          _context.t0 = _context["catch"](2);
-          console.log(_context.t0);
-          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context.t0.message
+          _context3.prev = 14;
+          _context3.t0 = _context3["catch"](2);
+          console.log(_context3.t0);
+          return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context3.t0.message
           })));
 
         case 18:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
     }
-  }, _callee, null, [[2, 14]]);
+  }, _callee3, null, [[2, 14]]);
 })));
-var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
   var payload,
-      _ref4,
+      _ref8,
       rejectWithValue,
       _list$status,
       _data$Result2,
@@ -30657,15 +30772,15 @@ var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication",
       list,
       body,
       data,
-      _args2 = arguments;
+      _args4 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee2$(_context2) {
+  return regeneratorRuntime.wrap(function _callee4$(_context4) {
     while (1) {
-      switch (_context2.prev = _context2.next) {
+      switch (_context4.prev = _context4.next) {
         case 0:
-          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-          _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
-          _context2.prev = 2;
+          payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
+          _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
+          _context4.prev = 2;
           list = payload; // const states = getState();
 
           body = [{
@@ -30689,76 +30804,76 @@ var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication",
           //         ))
           // }
 
-          _context2.next = 7;
+          _context4.next = 7;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __update__);
 
         case 7:
-          data = _context2.sent;
-          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context4.sent;
+          return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data === null || data === void 0 ? void 0 : (_data$Result2 = data.Result) === null || _data$Result2 === void 0 ? void 0 : (_data$Result2$ = _data$Result2[0]) === null || _data$Result2$ === void 0 ? void 0 : (_data$Result2$$proper = _data$Result2$.properties) === null || _data$Result2$$proper === void 0 ? void 0 : (_data$Result2$$proper2 = _data$Result2$$proper.doc) === null || _data$Result2$$proper2 === void 0 ? void 0 : _data$Result2$$proper2._id
           }));
 
         case 11:
-          _context2.prev = 11;
-          _context2.t0 = _context2["catch"](2);
-          console.log(_context2.t0);
-          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context2.t0.message
+          _context4.prev = 11;
+          _context4.t0 = _context4["catch"](2);
+          console.log(_context4.t0);
+          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context4.t0.message
           })));
 
         case 15:
         case "end":
-          return _context2.stop();
+          return _context4.stop();
       }
     }
-  }, _callee2, null, [[2, 11]]);
+  }, _callee4, null, [[2, 11]]);
 })));
-var GET_MEDICATIONS = createAsyncThunk("medicationsSlice/medication_list", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+var GET_MEDICATIONS = createAsyncThunk("medicationsSlice/medication_list", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
   var payload,
-      _ref6,
+      _ref10,
       rejectWithValue,
       id,
       data,
-      _args3 = arguments;
+      _args5 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  return regeneratorRuntime.wrap(function _callee5$(_context5) {
     while (1) {
-      switch (_context3.prev = _context3.next) {
+      switch (_context5.prev = _context5.next) {
         case 0:
-          payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-          _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
-          _context3.prev = 2;
+          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+          _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
+          _context5.prev = 2;
           id = payload.id;
-          _context3.next = 6;
+          _context5.next = 6;
           return fetchData$3({
             body: queries$5.getMedications(id)
           }, __readDocumentUrl__);
 
         case 6:
-          data = _context3.sent;
-          return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context5.sent;
+          return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data === null || data === void 0 ? void 0 : data.result
           }));
 
         case 10:
-          _context3.prev = 10;
-          _context3.t0 = _context3["catch"](2);
-          return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context3.t0.message
+          _context5.prev = 10;
+          _context5.t0 = _context5["catch"](2);
+          return _context5.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context5.t0.message
           })));
 
         case 13:
         case "end":
-          return _context3.stop();
+          return _context5.stop();
       }
     }
-  }, _callee3, null, [[2, 10]]);
+  }, _callee5, null, [[2, 10]]);
 })));
-var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workflow_status", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workflow_status", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
   var payload,
-      _ref8,
+      _ref12,
       rejectWithValue,
       getState,
       personId,
@@ -30771,15 +30886,15 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
       arr,
       data,
       PH_PresWorkflowStatusTrx,
-      _args4 = arguments;
+      _args6 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee4$(_context4) {
+  return regeneratorRuntime.wrap(function _callee6$(_context6) {
     while (1) {
-      switch (_context4.prev = _context4.next) {
+      switch (_context6.prev = _context6.next) {
         case 0:
-          payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
-          _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue, getState = _ref8.getState;
-          _context4.prev = 2;
+          payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          _ref12 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref12.rejectWithValue, getState = _ref12.getState;
+          _context6.prev = 2;
           personId = payload.personId;
           states = getState();
           flowStatus = states.MedicationMastersSlice.workflow_status_masters.data.filter(function (val) {
@@ -30816,39 +30931,39 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
               }
             };
           });
-          _context4.next = 13;
+          _context6.next = 13;
           return fetchData$3({
             body: JSON.stringify(arr)
           }, __update__);
 
         case 13:
-          data = _context4.sent;
-          _context4.next = 16;
+          data = _context6.sent;
+          _context6.next = 16;
           return fetchData$3({
             body: JSON.stringify(flowStatusList)
           }, __uspsertUrl__);
 
         case 16:
-          PH_PresWorkflowStatusTrx = _context4.sent;
-          return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          PH_PresWorkflowStatusTrx = _context6.sent;
+          return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data,
             PH_PresWorkflowStatusTrx: PH_PresWorkflowStatusTrx
           }));
 
         case 20:
-          _context4.prev = 20;
-          _context4.t0 = _context4["catch"](2);
-          console.log(_context4.t0);
-          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context4.t0.message
+          _context6.prev = 20;
+          _context6.t0 = _context6["catch"](2);
+          console.log(_context6.t0);
+          return _context6.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context6.t0.message
           })));
 
         case 24:
         case "end":
-          return _context4.stop();
+          return _context6.stop();
       }
     }
-  }, _callee4, null, [[2, 20]]);
+  }, _callee6, null, [[2, 20]]);
 })));
 var medicationsSlice = createSlice({
   name: "medicationsSlice",
@@ -30856,55 +30971,79 @@ var medicationsSlice = createSlice({
     save_medication: _objectSpread2({}, defaultState.Info),
     update_medication: _objectSpread2({}, defaultState.Info),
     update_workflow_status: _objectSpread2({}, defaultState.Info),
-    medication_list: _objectSpread2({}, defaultState.List)
+    medication_list: _objectSpread2({}, defaultState.List),
+    alert_codes: _objectSpread2({}, defaultState.list),
+    drug_codes: _objectSpread2({}, defaultState.list)
   },
-  extraReducers: (_extraReducers$f = {}, _defineProperty(_extraReducers$f, SAVE_MEDICATIONS.fulfilled, function (state, action) {
+  extraReducers: (_extraReducers$f = {}, _defineProperty(_extraReducers$f, ALERT_CODES.fulfilled, function (state, action) {
     var _action$payload;
 
-    state.save_medication.loading = false, state.save_medication.error = false, state.save_medication = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+    state.alert_codes.loading = false, state.alert_codes.error = false, state.alert_codes = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+  }), _defineProperty(_extraReducers$f, ALERT_CODES.pending, function (state, action) {
+    state.alert_codes.error = false, state.alert_codes.loading = true;
+  }), _defineProperty(_extraReducers$f, ALERT_CODES.rejected, function (state, action) {
+    var _action$payload2;
+
+    state.alert_codes.loading = false, state.alert_codes.error = true, state.alert_codes = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+  }), _defineProperty(_extraReducers$f, DRUG_CODES.fulfilled, function (state, action) {
+    var _action$payload3;
+
+    state.drug_codes.loading = false, state.drug_codes.error = false, state.drug_codes = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
+  }), _defineProperty(_extraReducers$f, DRUG_CODES.pending, function (state, action) {
+    state.drug_codes.error = false, state.drug_codes.loading = true;
+  }), _defineProperty(_extraReducers$f, DRUG_CODES.rejected, function (state, action) {
+    var _action$payload4;
+
+    state.drug_codes.loading = false, state.drug_codes.error = true, state.drug_codes = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
+  }), _defineProperty(_extraReducers$f, SAVE_MEDICATIONS.fulfilled, function (state, action) {
+    var _action$payload5;
+
+    state.save_medication.loading = false, state.save_medication.error = false, state.save_medication = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
   }), _defineProperty(_extraReducers$f, SAVE_MEDICATIONS.pending, function (state, action) {
     state.save_medication.error = false, state.save_medication.loading = true;
   }), _defineProperty(_extraReducers$f, SAVE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload2;
+    var _action$payload6;
 
-    state.save_medication.loading = false, state.save_medication.error = true, state.save_medication = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+    state.save_medication.loading = false, state.save_medication.error = true, state.save_medication = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
   }), _defineProperty(_extraReducers$f, UPDATE_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload3;
+    var _action$payload7;
 
-    state.update_medication.loading = false, state.update_medication.error = false, state.update_medication = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
+    state.update_medication.loading = false, state.update_medication.error = false, state.update_medication = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
   }), _defineProperty(_extraReducers$f, UPDATE_MEDICATIONS.pending, function (state, action) {
     state.update_medication.error = false, state.update_medication.loading = true;
   }), _defineProperty(_extraReducers$f, UPDATE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload4;
+    var _action$payload8;
 
-    state.update_medication.loading = false, state.update_medication.error = true, state.update_medication = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
+    state.update_medication.loading = false, state.update_medication.error = true, state.update_medication = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
   }), _defineProperty(_extraReducers$f, GET_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload5;
+    var _action$payload9;
 
-    state.medication_list.loading = false, state.medication_list.error = false, state.medication_list = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
+    state.medication_list.loading = false, state.medication_list.error = false, state.medication_list = (_action$payload9 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload9 !== void 0 ? _action$payload9 : {};
   }), _defineProperty(_extraReducers$f, GET_MEDICATIONS.pending, function (state, action) {
     state.medication_list.error = false, state.medication_list.loading = true;
   }), _defineProperty(_extraReducers$f, GET_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload6;
+    var _action$payload10;
 
-    state.medication_list.loading = false, state.medication_list.error = true, state.medication_list = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
+    state.medication_list.loading = false, state.medication_list.error = true, state.medication_list = (_action$payload10 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload10 !== void 0 ? _action$payload10 : {};
   }), _defineProperty(_extraReducers$f, UPDATE_ALL_WORKFLOW_STATUS.fulfilled, function (state, action) {
-    var _action$payload7;
+    var _action$payload11;
 
-    state.update_workflow_status.loading = false, state.update_workflow_status.error = false, state.update_workflow_status = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = false, state.update_workflow_status = (_action$payload11 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload11 !== void 0 ? _action$payload11 : {};
   }), _defineProperty(_extraReducers$f, UPDATE_ALL_WORKFLOW_STATUS.pending, function (state, action) {
     state.update_workflow_status.error = false, state.update_workflow_status.loading = true;
   }), _defineProperty(_extraReducers$f, UPDATE_ALL_WORKFLOW_STATUS.rejected, function (state, action) {
-    var _action$payload8;
+    var _action$payload12;
 
-    state.update_workflow_status.loading = false, state.update_workflow_status.error = true, state.update_workflow_status = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = true, state.update_workflow_status = (_action$payload12 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload12 !== void 0 ? _action$payload12 : {};
   }), _extraReducers$f)
 });
 var medicationsActions = {
   SAVE_MEDICATIONS: SAVE_MEDICATIONS,
   GET_MEDICATIONS: GET_MEDICATIONS,
   UPDATE_MEDICATIONS: UPDATE_MEDICATIONS,
-  UPDATE_ALL_WORKFLOW_STATUS: UPDATE_ALL_WORKFLOW_STATUS
+  UPDATE_ALL_WORKFLOW_STATUS: UPDATE_ALL_WORKFLOW_STATUS,
+  ALERT_CODES: ALERT_CODES,
+  DRUG_CODES: DRUG_CODES
 };
 var medicationsSlice$1 = medicationsSlice.reducer;
 
@@ -30939,7 +31078,7 @@ var queries$4 = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='TREAT' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:document(req.organization),practId:(for prac in Practitioner filter prac._id==req.practId return merge({id: prac._id, name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))})),practRole:document(req.practRole)}))})"
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -31219,7 +31358,7 @@ var generateJSON$1 = function generateJSON(dataList) {
 
 var generateResJson$2 = function generateResJson(dataList, arr) {
   var list = dataList.map(function (val) {
-    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor10$$pra3, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
+    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$pra, _val$Requestor11$$pra2, _val$Requestor11$$pra3, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis = val.diagnosis) === null || _val$diagnosis === void 0 ? void 0 : _val$diagnosis.map(function (v) {
       return {
@@ -31315,8 +31454,9 @@ var generateResJson$2 = function generateResJson(dataList, arr) {
         },
         practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor8 = val.Requestor) === null || _val$Requestor8 === void 0 ? void 0 : (_val$Requestor8$ = _val$Requestor8[0]) === null || _val$Requestor8$ === void 0 ? void 0 : (_val$Requestor8$$prac = _val$Requestor8$.practId) === null || _val$Requestor8$$prac === void 0 ? void 0 : (_val$Requestor8$$prac2 = _val$Requestor8$$prac[0]) === null || _val$Requestor8$$prac2 === void 0 ? void 0 : (_val$Requestor8$$prac3 = _val$Requestor8$$prac2.name) === null || _val$Requestor8$$prac3 === void 0 ? void 0 : _val$Requestor8$$prac3[0],
         orderBy: {
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor9 = val.Requestor) === null || _val$Requestor9 === void 0 ? void 0 : (_val$Requestor9$ = _val$Requestor9[0]) === null || _val$Requestor9$ === void 0 ? void 0 : (_val$Requestor9$$prac = _val$Requestor9$.practId) === null || _val$Requestor9$$prac === void 0 ? void 0 : (_val$Requestor9$$prac2 = _val$Requestor9$$prac[0]) === null || _val$Requestor9$$prac2 === void 0 ? void 0 : _val$Requestor9$$prac2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : (_val$Requestor10$$pra3 = _val$Requestor10$$pra2.name) === null || _val$Requestor10$$pra3 === void 0 ? void 0 : _val$Requestor10$$pra3[0]) || {})
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor9 = val.Requestor) === null || _val$Requestor9 === void 0 ? void 0 : (_val$Requestor9$ = _val$Requestor9[0]) === null || _val$Requestor9$ === void 0 ? void 0 : (_val$Requestor9$$prac = _val$Requestor9$.practId) === null || _val$Requestor9$$prac === void 0 ? void 0 : (_val$Requestor9$$prac2 = _val$Requestor9$$prac[0]) === null || _val$Requestor9$$prac2 === void 0 ? void 0 : _val$Requestor9$$prac2.practitioner_id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : _val$Requestor10$$pra2.id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$pra = _val$Requestor11$.practId) === null || _val$Requestor11$$pra === void 0 ? void 0 : (_val$Requestor11$$pra2 = _val$Requestor11$$pra[0]) === null || _val$Requestor11$$pra2 === void 0 ? void 0 : (_val$Requestor11$$pra3 = _val$Requestor11$$pra2.name) === null || _val$Requestor11$$pra3 === void 0 ? void 0 : _val$Requestor11$$pra3[0]) || {})
         }
       },
       indication: {
@@ -31372,7 +31512,7 @@ var RecurrentgenerateResJson$1 = function RecurrentgenerateResJson(dataList, arr
     return el != null;
   });
   var list = dataList.map(function (val) {
-    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$org, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor$0$prac3, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$pra, _val$Requestor$0$prac4, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor18$$pra2, _val$Requestor18$$pra3, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor20$$pra3, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
+    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$org, _val$Requestor$0$prac3, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor$0$prac4, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor19$$pra3, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor21, _val$Requestor21$, _val$Requestor21$$pra, _val$Requestor21$$pra2, _val$Requestor22, _val$Requestor22$, _val$Requestor22$$pra, _val$Requestor22$$pra2, _val$Requestor22$$pra3, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis2 = val.diagnosis) === null || _val$diagnosis2 === void 0 ? void 0 : _val$diagnosis2.map(function (v) {
       return {
@@ -31451,20 +31591,21 @@ var RecurrentgenerateResJson$1 = function RecurrentgenerateResJson(dataList, arr
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
         organization: {
-          label: val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$org = _val$Requestor11$.organization) === null || _val$Requestor11$$org === void 0 ? void 0 : _val$Requestor11$$org._id,
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org.name,
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.id
+          label: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org._id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.name,
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$org = _val$Requestor14$.organization) === null || _val$Requestor14$$org === void 0 ? void 0 : _val$Requestor14$$org.id
         },
         practitionerRole: {
-          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$pra = _val$Requestor14$.practRole) === null || _val$Requestor14$$pra === void 0 ? void 0 : _val$Requestor14$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
-          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.id,
-          _id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra._id
+          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
+          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra.id,
+          _id: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practRole) === null || _val$Requestor18$$pra === void 0 ? void 0 : _val$Requestor18$$pra._id
         },
-        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practId) === null || _val$Requestor18$$pra === void 0 ? void 0 : (_val$Requestor18$$pra2 = _val$Requestor18$$pra[0]) === null || _val$Requestor18$$pra2 === void 0 ? void 0 : (_val$Requestor18$$pra3 = _val$Requestor18$$pra2.name) === null || _val$Requestor18$$pra3 === void 0 ? void 0 : _val$Requestor18$$pra3[0],
+        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : (_val$Requestor19$$pra3 = _val$Requestor19$$pra2.name) === null || _val$Requestor19$$pra3 === void 0 ? void 0 : _val$Requestor19$$pra3[0],
         orderBy: {
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : _val$Requestor19$$pra2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : (_val$Requestor20$$pra3 = _val$Requestor20$$pra2.name) === null || _val$Requestor20$$pra3 === void 0 ? void 0 : _val$Requestor20$$pra3[0]) || {})
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : _val$Requestor20$$pra2.practitioner_id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor21 = val.Requestor) === null || _val$Requestor21 === void 0 ? void 0 : (_val$Requestor21$ = _val$Requestor21[0]) === null || _val$Requestor21$ === void 0 ? void 0 : (_val$Requestor21$$pra = _val$Requestor21$.practId) === null || _val$Requestor21$$pra === void 0 ? void 0 : (_val$Requestor21$$pra2 = _val$Requestor21$$pra[0]) === null || _val$Requestor21$$pra2 === void 0 ? void 0 : _val$Requestor21$$pra2.id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor22 = val.Requestor) === null || _val$Requestor22 === void 0 ? void 0 : (_val$Requestor22$ = _val$Requestor22[0]) === null || _val$Requestor22$ === void 0 ? void 0 : (_val$Requestor22$$pra = _val$Requestor22$.practId) === null || _val$Requestor22$$pra === void 0 ? void 0 : (_val$Requestor22$$pra2 = _val$Requestor22$$pra[0]) === null || _val$Requestor22$$pra2 === void 0 ? void 0 : (_val$Requestor22$$pra3 = _val$Requestor22$$pra2.name) === null || _val$Requestor22$$pra3 === void 0 ? void 0 : _val$Requestor22$$pra3[0]) || {})
         }
       },
       indication: {
@@ -32302,12 +32443,13 @@ var TREATMENT_ORGANIZATION = createAsyncThunk("TreatmentSlice/getorderorganizati
           data3 = _context14.sent;
           arr3 = [];
           data3 === null || data3 === void 0 ? void 0 : (_data3$result = data3.result) === null || _data3$result === void 0 ? void 0 : _data3$result.map(function (val) {
-            var _val$shortdesc4, _val$shortdesc5, _val$_id6;
+            var _val$shortdesc4, _val$shortdesc5, _val$_id6, _val$locationID;
 
             arr3.push({
               label: (_val$shortdesc4 = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc4 !== void 0 ? _val$shortdesc4 : "",
               value: (_val$shortdesc5 = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc5 !== void 0 ? _val$shortdesc5 : "",
-              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : ""
+              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : "",
+              locationID: (_val$locationID = val === null || val === void 0 ? void 0 : val.locationID) !== null && _val$locationID !== void 0 ? _val$locationID : ""
             });
           });
           _context14.next = 26;
@@ -32851,7 +32993,7 @@ var queries$3 = (_queries = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='RAD' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:document(req.organization),practId:(for prac in Practitioner filter prac._id==req.practId return merge({id: prac._id, name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))})),practRole:document(req.practRole)}))})"
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {practitioner_id: prac.practitioner_id, id:prac._id,name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -33133,7 +33275,7 @@ var generateJSON = function generateJSON(dataList) {
 
 var generateResJson$1 = function generateResJson(dataList, arr) {
   var list = dataList.map(function (val) {
-    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor10$$pra3, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
+    var _val$diagnosis, _val$performer, _val$recurrent, _val$recurrent$, _val$priority, _val$OrderNature, _moment$unix$format, _val$recurrent2, _val$recurrent2$, _moment$unix$format2, _val$recurrent3, _val$recurrent3$, _JSON$stringify, _val$recurrent4, _val$recurrent4$, _val$recurrent$0$ever, _val$recurrent5, _val$recurrent5$, _val$recurrent$0$ever2, _val$recurrent6, _val$recurrent6$, _moment$unix$format3, _val$recurrent7, _val$recurrent7$, _JSON$stringify2, _val$recurrent8, _val$recurrent8$, _val$recurrent9, _val$recurrent9$, _moment$unix$format4, _val$recurrent10, _val$recurrent10$, _moment$unix$format5, _val$Requestor, _val$Requestor$, _val$Requestor$$organ, _val$Requestor2, _val$Requestor2$, _val$Requestor2$$orga, _val$Requestor3, _val$Requestor3$, _val$Requestor3$$orga, _val$Requestor$0$prac, _val$Requestor4, _val$Requestor4$, _val$Requestor4$$prac, _val$Requestor$0$prac2, _val$Requestor5, _val$Requestor5$, _val$Requestor5$$prac, _val$Requestor6, _val$Requestor6$, _val$Requestor6$$prac, _val$Requestor7, _val$Requestor7$, _val$Requestor7$$prac, _val$Requestor8, _val$Requestor8$, _val$Requestor8$$prac, _val$Requestor8$$prac2, _val$Requestor8$$prac3, _val$Requestor9, _val$Requestor9$, _val$Requestor9$$prac, _val$Requestor9$$prac2, _val$Requestor10, _val$Requestor10$, _val$Requestor10$$pra, _val$Requestor10$$pra2, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$pra, _val$Requestor11$$pra2, _val$Requestor11$$pra3, _val$patientInstructi, _val$patientInstructi2, _val$patientInstructi3, _val$patientInstructi4, _val$patientInstructi5, _val$patientInstructi6, _val$patientInstructi7, _val$patientInstructi8, _val$preparatoryInstr, _val$preparatoryInstr2, _val$preparatoryInstr3, _val$preparatoryInstr4, _val$preparatoryInstr5, _val$preparatoryInstr6, _val$preparatoryInstr7, _val$preparatoryInstr8, _val$departmentalInst, _val$departmentalInst2, _val$departmentalInst3, _val$departmentalInst4, _val$departmentalInst5, _val$departmentalInst6, _val$departmentalInst7, _val$departmentalInst8, _val$attribute, _val$attribute$, _val$attribute2, _val$attribute2$, _val$attribute$0$bedS, _val$attribute3, _val$attribute3$, _val$attribute$0$cont, _val$attribute4, _val$attribute4$, _val$createddate, _val$changeStatus, _val$changeStatus2, _val$changeStatus3, _val$statushistory, _val$statusreason, _val$accessionNum;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis = val.diagnosis) === null || _val$diagnosis === void 0 ? void 0 : _val$diagnosis.map(function (v) {
       return {
@@ -33229,8 +33371,9 @@ var generateResJson$1 = function generateResJson(dataList, arr) {
         },
         practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor8 = val.Requestor) === null || _val$Requestor8 === void 0 ? void 0 : (_val$Requestor8$ = _val$Requestor8[0]) === null || _val$Requestor8$ === void 0 ? void 0 : (_val$Requestor8$$prac = _val$Requestor8$.practId) === null || _val$Requestor8$$prac === void 0 ? void 0 : (_val$Requestor8$$prac2 = _val$Requestor8$$prac[0]) === null || _val$Requestor8$$prac2 === void 0 ? void 0 : (_val$Requestor8$$prac3 = _val$Requestor8$$prac2.name) === null || _val$Requestor8$$prac3 === void 0 ? void 0 : _val$Requestor8$$prac3[0],
         orderBy: {
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor9 = val.Requestor) === null || _val$Requestor9 === void 0 ? void 0 : (_val$Requestor9$ = _val$Requestor9[0]) === null || _val$Requestor9$ === void 0 ? void 0 : (_val$Requestor9$$prac = _val$Requestor9$.practId) === null || _val$Requestor9$$prac === void 0 ? void 0 : (_val$Requestor9$$prac2 = _val$Requestor9$$prac[0]) === null || _val$Requestor9$$prac2 === void 0 ? void 0 : _val$Requestor9$$prac2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : (_val$Requestor10$$pra3 = _val$Requestor10$$pra2.name) === null || _val$Requestor10$$pra3 === void 0 ? void 0 : _val$Requestor10$$pra3[0]) || {})
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor9 = val.Requestor) === null || _val$Requestor9 === void 0 ? void 0 : (_val$Requestor9$ = _val$Requestor9[0]) === null || _val$Requestor9$ === void 0 ? void 0 : (_val$Requestor9$$prac = _val$Requestor9$.practId) === null || _val$Requestor9$$prac === void 0 ? void 0 : (_val$Requestor9$$prac2 = _val$Requestor9$$prac[0]) === null || _val$Requestor9$$prac2 === void 0 ? void 0 : _val$Requestor9$$prac2.practitioner_id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor10 = val.Requestor) === null || _val$Requestor10 === void 0 ? void 0 : (_val$Requestor10$ = _val$Requestor10[0]) === null || _val$Requestor10$ === void 0 ? void 0 : (_val$Requestor10$$pra = _val$Requestor10$.practId) === null || _val$Requestor10$$pra === void 0 ? void 0 : (_val$Requestor10$$pra2 = _val$Requestor10$$pra[0]) === null || _val$Requestor10$$pra2 === void 0 ? void 0 : _val$Requestor10$$pra2.id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$pra = _val$Requestor11$.practId) === null || _val$Requestor11$$pra === void 0 ? void 0 : (_val$Requestor11$$pra2 = _val$Requestor11$$pra[0]) === null || _val$Requestor11$$pra2 === void 0 ? void 0 : (_val$Requestor11$$pra3 = _val$Requestor11$$pra2.name) === null || _val$Requestor11$$pra3 === void 0 ? void 0 : _val$Requestor11$$pra3[0]) || {})
         }
       },
       indication: {
@@ -33286,7 +33429,7 @@ var RecurrentgenerateResJson = function RecurrentgenerateResJson(dataList, arr)
     return el != null;
   });
   var list = dataList.map(function (val) {
-    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor11, _val$Requestor11$, _val$Requestor11$$org, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor$0$prac3, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$pra, _val$Requestor$0$prac4, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor18$$pra2, _val$Requestor18$$pra3, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor20$$pra3, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
+    var _val$diagnosis2, _val$performer2, _val$recurrent11, _val$recurrent11$, _val$priority2, _val$OrderNature2, _moment$unix$format6, _JSON$stringify3, _val$recurrent12, _val$recurrent12$, _val$recurrent$0$ever3, _val$recurrent13, _val$recurrent13$, _val$recurrent$0$ever4, _val$recurrent14, _val$recurrent14$, _moment$unix$format7, _val$recurrent15, _val$recurrent15$, _JSON$stringify4, _val$recurrent16, _val$recurrent16$, _val$recurrent17, _val$recurrent17$, _moment$unix$format8, _val$recurrent18, _val$recurrent18$, _moment$unix$format9, _val$Requestor12, _val$Requestor12$, _val$Requestor12$$org, _val$Requestor13, _val$Requestor13$, _val$Requestor13$$org, _val$Requestor14, _val$Requestor14$, _val$Requestor14$$org, _val$Requestor$0$prac3, _val$Requestor15, _val$Requestor15$, _val$Requestor15$$pra, _val$Requestor$0$prac4, _val$Requestor16, _val$Requestor16$, _val$Requestor16$$pra, _val$Requestor17, _val$Requestor17$, _val$Requestor17$$pra, _val$Requestor18, _val$Requestor18$, _val$Requestor18$$pra, _val$Requestor19, _val$Requestor19$, _val$Requestor19$$pra, _val$Requestor19$$pra2, _val$Requestor19$$pra3, _val$Requestor20, _val$Requestor20$, _val$Requestor20$$pra, _val$Requestor20$$pra2, _val$Requestor21, _val$Requestor21$, _val$Requestor21$$pra, _val$Requestor21$$pra2, _val$Requestor22, _val$Requestor22$, _val$Requestor22$$pra, _val$Requestor22$$pra2, _val$Requestor22$$pra3, _val$patientInstructi9, _val$patientInstructi10, _val$patientInstructi11, _val$patientInstructi12, _val$patientInstructi13, _val$patientInstructi14, _val$patientInstructi15, _val$patientInstructi16, _val$preparatoryInstr9, _val$preparatoryInstr10, _val$preparatoryInstr11, _val$preparatoryInstr12, _val$preparatoryInstr13, _val$preparatoryInstr14, _val$preparatoryInstr15, _val$preparatoryInstr16, _val$departmentalInst9, _val$departmentalInst10, _val$departmentalInst11, _val$departmentalInst12, _val$departmentalInst13, _val$departmentalInst14, _val$departmentalInst15, _val$departmentalInst16, _val$attribute5, _val$attribute5$, _val$attribute6, _val$attribute6$, _val$attribute$0$bedS2, _val$attribute7, _val$attribute7$, _val$attribute$0$cont2, _val$attribute8, _val$attribute8$, _val$createddate2, _val$changeStatus4, _val$changeStatus5, _val$changeStatus6, _val$statushistory2, _val$statusreason2, _val$accessionNum2;
 
     var diagnosisData = val === null || val === void 0 ? void 0 : (_val$diagnosis2 = val.diagnosis) === null || _val$diagnosis2 === void 0 ? void 0 : _val$diagnosis2.map(function (v) {
       return {
@@ -33369,20 +33512,21 @@ var RecurrentgenerateResJson = function RecurrentgenerateResJson(dataList, arr)
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
         organization: {
-          label: val === null || val === void 0 ? void 0 : (_val$Requestor11 = val.Requestor) === null || _val$Requestor11 === void 0 ? void 0 : (_val$Requestor11$ = _val$Requestor11[0]) === null || _val$Requestor11$ === void 0 ? void 0 : (_val$Requestor11$$org = _val$Requestor11$.organization) === null || _val$Requestor11$$org === void 0 ? void 0 : _val$Requestor11$$org._id,
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org.name,
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.id
+          label: val === null || val === void 0 ? void 0 : (_val$Requestor12 = val.Requestor) === null || _val$Requestor12 === void 0 ? void 0 : (_val$Requestor12$ = _val$Requestor12[0]) === null || _val$Requestor12$ === void 0 ? void 0 : (_val$Requestor12$$org = _val$Requestor12$.organization) === null || _val$Requestor12$$org === void 0 ? void 0 : _val$Requestor12$$org._id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor13 = val.Requestor) === null || _val$Requestor13 === void 0 ? void 0 : (_val$Requestor13$ = _val$Requestor13[0]) === null || _val$Requestor13$ === void 0 ? void 0 : (_val$Requestor13$$org = _val$Requestor13$.organization) === null || _val$Requestor13$$org === void 0 ? void 0 : _val$Requestor13$$org.name,
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$org = _val$Requestor14$.organization) === null || _val$Requestor14$$org === void 0 ? void 0 : _val$Requestor14$$org.id
         },
         practitionerRole: {
-          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor14 = val.Requestor) === null || _val$Requestor14 === void 0 ? void 0 : (_val$Requestor14$ = _val$Requestor14[0]) === null || _val$Requestor14$ === void 0 ? void 0 : (_val$Requestor14$$pra = _val$Requestor14$.practRole) === null || _val$Requestor14$$pra === void 0 ? void 0 : _val$Requestor14$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
-          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
-          id: val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.id,
-          _id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra._id
+          label: (_val$Requestor$0$prac3 = val === null || val === void 0 ? void 0 : (_val$Requestor15 = val.Requestor) === null || _val$Requestor15 === void 0 ? void 0 : (_val$Requestor15$ = _val$Requestor15[0]) === null || _val$Requestor15$ === void 0 ? void 0 : (_val$Requestor15$$pra = _val$Requestor15$.practRole) === null || _val$Requestor15$$pra === void 0 ? void 0 : _val$Requestor15$$pra.display) !== null && _val$Requestor$0$prac3 !== void 0 ? _val$Requestor$0$prac3 : "",
+          value: (_val$Requestor$0$prac4 = val === null || val === void 0 ? void 0 : (_val$Requestor16 = val.Requestor) === null || _val$Requestor16 === void 0 ? void 0 : (_val$Requestor16$ = _val$Requestor16[0]) === null || _val$Requestor16$ === void 0 ? void 0 : (_val$Requestor16$$pra = _val$Requestor16$.practRole) === null || _val$Requestor16$$pra === void 0 ? void 0 : _val$Requestor16$$pra.display) !== null && _val$Requestor$0$prac4 !== void 0 ? _val$Requestor$0$prac4 : "",
+          id: val === null || val === void 0 ? void 0 : (_val$Requestor17 = val.Requestor) === null || _val$Requestor17 === void 0 ? void 0 : (_val$Requestor17$ = _val$Requestor17[0]) === null || _val$Requestor17$ === void 0 ? void 0 : (_val$Requestor17$$pra = _val$Requestor17$.practRole) === null || _val$Requestor17$$pra === void 0 ? void 0 : _val$Requestor17$$pra.id,
+          _id: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practRole) === null || _val$Requestor18$$pra === void 0 ? void 0 : _val$Requestor18$$pra._id
         },
-        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor18 = val.Requestor) === null || _val$Requestor18 === void 0 ? void 0 : (_val$Requestor18$ = _val$Requestor18[0]) === null || _val$Requestor18$ === void 0 ? void 0 : (_val$Requestor18$$pra = _val$Requestor18$.practId) === null || _val$Requestor18$$pra === void 0 ? void 0 : (_val$Requestor18$$pra2 = _val$Requestor18$$pra[0]) === null || _val$Requestor18$$pra2 === void 0 ? void 0 : (_val$Requestor18$$pra3 = _val$Requestor18$$pra2.name) === null || _val$Requestor18$$pra3 === void 0 ? void 0 : _val$Requestor18$$pra3[0],
+        practitionerId: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : (_val$Requestor19$$pra3 = _val$Requestor19$$pra2.name) === null || _val$Requestor19$$pra3 === void 0 ? void 0 : _val$Requestor19$$pra3[0],
         orderBy: {
-          value: val === null || val === void 0 ? void 0 : (_val$Requestor19 = val.Requestor) === null || _val$Requestor19 === void 0 ? void 0 : (_val$Requestor19$ = _val$Requestor19[0]) === null || _val$Requestor19$ === void 0 ? void 0 : (_val$Requestor19$$pra = _val$Requestor19$.practId) === null || _val$Requestor19$$pra === void 0 ? void 0 : (_val$Requestor19$$pra2 = _val$Requestor19$$pra[0]) === null || _val$Requestor19$$pra2 === void 0 ? void 0 : _val$Requestor19$$pra2.id,
-          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : (_val$Requestor20$$pra3 = _val$Requestor20$$pra2.name) === null || _val$Requestor20$$pra3 === void 0 ? void 0 : _val$Requestor20$$pra3[0]) || {})
+          practitioner_id: val === null || val === void 0 ? void 0 : (_val$Requestor20 = val.Requestor) === null || _val$Requestor20 === void 0 ? void 0 : (_val$Requestor20$ = _val$Requestor20[0]) === null || _val$Requestor20$ === void 0 ? void 0 : (_val$Requestor20$$pra = _val$Requestor20$.practId) === null || _val$Requestor20$$pra === void 0 ? void 0 : (_val$Requestor20$$pra2 = _val$Requestor20$$pra[0]) === null || _val$Requestor20$$pra2 === void 0 ? void 0 : _val$Requestor20$$pra2.practitioner_id,
+          value: val === null || val === void 0 ? void 0 : (_val$Requestor21 = val.Requestor) === null || _val$Requestor21 === void 0 ? void 0 : (_val$Requestor21$ = _val$Requestor21[0]) === null || _val$Requestor21$ === void 0 ? void 0 : (_val$Requestor21$$pra = _val$Requestor21$.practId) === null || _val$Requestor21$$pra === void 0 ? void 0 : (_val$Requestor21$$pra2 = _val$Requestor21$$pra[0]) === null || _val$Requestor21$$pra2 === void 0 ? void 0 : _val$Requestor21$$pra2.id,
+          label: makeName((val === null || val === void 0 ? void 0 : (_val$Requestor22 = val.Requestor) === null || _val$Requestor22 === void 0 ? void 0 : (_val$Requestor22$ = _val$Requestor22[0]) === null || _val$Requestor22$ === void 0 ? void 0 : (_val$Requestor22$$pra = _val$Requestor22$.practId) === null || _val$Requestor22$$pra === void 0 ? void 0 : (_val$Requestor22$$pra2 = _val$Requestor22$$pra[0]) === null || _val$Requestor22$$pra2 === void 0 ? void 0 : (_val$Requestor22$$pra3 = _val$Requestor22$$pra2.name) === null || _val$Requestor22$$pra3 === void 0 ? void 0 : _val$Requestor22$$pra3[0]) || {})
         }
       },
       indication: {
@@ -34282,12 +34426,13 @@ var RAD_ORGANIZATION = createAsyncThunk("RadiologySlice/getorderorganization", /
           data3 = _context15.sent;
           arr3 = [];
           data3 === null || data3 === void 0 ? void 0 : (_data3$result = data3.result) === null || _data3$result === void 0 ? void 0 : _data3$result.map(function (val) {
-            var _val$shortdesc5, _val$shortdesc6, _val$_id6;
+            var _val$shortdesc5, _val$shortdesc6, _val$_id6, _val$locationID;
 
             arr3.push({
               label: (_val$shortdesc5 = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc5 !== void 0 ? _val$shortdesc5 : "",
               value: (_val$shortdesc6 = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc6 !== void 0 ? _val$shortdesc6 : "",
-              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : ""
+              id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : "",
+              locationID: (_val$locationID = val === null || val === void 0 ? void 0 : val.locationID) !== null && _val$locationID !== void 0 ? _val$locationID : ""
             });
           });
           _context15.next = 26;
@@ -36679,43 +36824,45 @@ var queries$1 = {
   },
   getChartTime: function getChartTime(_ref) {
     var id = _ref.id,
-        start = _ref.start,
-        end = _ref.end,
+        date = _ref.date,
         type = _ref.type;
 
     if (type === "Specialty") {
       return {
         db_name: dbName,
-        entity: "Practitioner,Encounter",
+        queryid: "bcf60a17-edcf-4657-9265-c2ba8068a7f8",
         filter: {
-          Practitioner: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY =='".concat(id, "' "),
-          Encounter: "Encounter.status=='CodingMaster/11595' and DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(start, " && Encounter.encounterdate<=").concat(end, " LET checkInPer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/12164' RETURN document(sh.period)[*].end ) LET triagePer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].start) let triend=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].end) let inProg=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].start) let inProge=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].end) let completed=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11598' RETURN document(sh.period)[*].start)")
-        },
-        return_fields: "{differenceCheckedintoTriage:(FIRST(triagePer)-FIRST(checkInPer))/60,differenceTriagetoInprogress:(FIRST(inProg)-FIRST(triend))/60,differenceInprogresstoCompleted:(FIRST(completed)-FIRST(inProge))/60,Total:((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60),Average:(((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60))/3}"
+          speciality: id,
+          orgid: "",
+          practid: "",
+          date: date
+        }
       };
     }
 
     if (type === "Clinic") {
       return {
         db_name: dbName,
-        entity: "Practitioner,Encounter",
+        queryid: "bcf60a17-edcf-4657-9265-c2ba8068a7f8",
         filter: {
-          Practitioner: "DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='".concat(id, "' "),
-          Encounter: "Encounter.status=='CodingMaster/11595' and DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(start, " && Encounter.encounterdate<=").concat(end, " LET checkInPer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/12164' RETURN document(sh.period)[*].end ) LET triagePer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].start) let triend=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].end) let inProg=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].start) let inProge=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].end) let completed=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11598' RETURN document(sh.period)[*].start)")
-        },
-        return_fields: "{differenceCheckedintoTriage:(FIRST(triagePer)-FIRST(checkInPer))/60,differenceTriagetoInprogress:(FIRST(inProg)-FIRST(triend))/60,differenceInprogresstoCompleted:(FIRST(completed)-FIRST(inProge))/60,Total:((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60),Average:(((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60))/3}"
+          speciality: "",
+          orgid: id,
+          practid: "",
+          date: date
+        }
       };
     }
 
     if (type === "Practitioner") {
       return {
         db_name: dbName,
-        entity: "Practitioner,Encounter",
+        queryid: "bcf60a17-edcf-4657-9265-c2ba8068a7f8",
         filter: {
-          Practitioner: "Practitioner.id==".concat(id, " "),
-          Encounter: "Encounter.status=='CodingMaster/11595' and DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(start, " && Encounter.encounterdate<=").concat(end, " LET checkInPer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/12164' RETURN document(sh.period)[*].end ) LET triagePer=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].start) let triend=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11595' RETURN document(sh.period)[*].end) let inProg=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].start) let inProge=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11596' RETURN document(sh.period)[*].end) let completed=(FOR sh IN Encounter.statushistory FILTER sh.status=='CodingMaster/11598' RETURN document(sh.period)[*].start)")
-        },
-        return_fields: "{differenceCheckedintoTriage:(FIRST(triagePer)-FIRST(checkInPer))/60,differenceTriagetoInprogress:(FIRST(inProg)-FIRST(triend))/60,differenceInprogresstoCompleted:(FIRST(completed)-FIRST(inProge))/60,Total:((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60),Average:(((FIRST(triagePer)-FIRST(checkInPer))/60)+((FIRST(inProg)-FIRST(triend))/60)+((FIRST(completed)-FIRST(inProge))/60))/3}"
+          speciality: "",
+          orgid: "",
+          practid: id,
+          date: date
+        }
       };
     }
   }
@@ -36740,7 +36887,7 @@ var config$1 = [{
         return {
           _id: _id,
           id: id,
-          value: id,
+          value: _id,
           label: makeName((name === null || name === void 0 ? void 0 : name[0]) || {}),
           _key: _key
         };
@@ -36812,18 +36959,20 @@ var config$1 = [{
   sliceName: "updateWaitingTimeChart",
   queryName: "getChartTime",
   type: "List",
-  url: __readDocumentUrl__,
-  makeReturnData: function makeReturnData(data) {
+  url: __baseUrl__,
+  makeReturnData: function makeReturnData(data, payload) {
+    var _payload$date;
+
     var arrivalCheckin = [];
     var checkinTriage = [];
     var triageConsultation = [];
     var overall = [];
 
-    if (Array.isArray(data.result)) {
-      data.result.forEach(function (d) {
-        checkinTriage.push(Number(Number(d.differenceCheckedintoTriage).toFixed(1)));
-        triageConsultation.push(Number(Number(d.differenceTriagetoInprogress).toFixed(1)));
-        overall.push(Number(Number(d.Total).toFixed(1)));
+    if (Array.isArray(data)) {
+      data.forEach(function (d) {
+        checkinTriage.push(d.diffbetweenchekintotriage);
+        triageConsultation.push(d.diffbetweentriagedtofinished);
+        overall.push(d.Overallwaitingtime);
       });
     }
 
@@ -36857,7 +37006,9 @@ var config$1 = [{
       period: "Mins"
     }];
     return {
-      labels: ["10 AM", "11 AM", "01 PM", "03 PM", "05 PM", "07 PM"],
+      labels: (_payload$date = payload.date) === null || _payload$date === void 0 ? void 0 : _payload$date.map(function (v) {
+        return moment.unix(v.start).format("hh A");
+      }),
       datasets: datasets
     };
   }
@@ -36919,7 +37070,7 @@ config$1.forEach(function (c) {
 
           case 8:
             data = _context.sent;
-            returnData = c.makeReturnData ? c.makeReturnData(data) : data;
+            returnData = c.makeReturnData ? c.makeReturnData(data, payload) : data;
             return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState[c.type]), {}, {
               data: returnData
             }));
@@ -38605,50 +38756,173 @@ var appointmentStatsApiActions = {
 var dashboardComponentApiSlice = appointmentStatsApiSlice.reducer;
 
 var alertInteractionsQuery = {
-  alertInteractions: function alertInteractions() {
+  alertInteractions: function alertInteractions(alertList) {
+    var _alertList$creatinine, _alertList$creatinine2, _alertList$drugCodes, _alertList$diseaseCod, _alertList$allergyCod;
+
     return {
-      "Patient": {
-        "Age": 25,
-        "PatientName": "Fraklin Stephen",
-        "Weight": 5450,
-        "Height": 50,
-        "CreatinineClearance": {
-          "Value": 67,
-          "UOM": "MG/DAY"
+      //   "Patient": {
+      //     "Age": 25,
+      //     "PatientName": "Fraklin Stephen",
+      //     "Weight": 5450,
+      //     "Height": 50,
+      //     "CreatinineClearance": {
+      //         "Value": 67,
+      //         "UOM": "MG/DAY"
+      //     },
+      //     "GestationalBirthAge": 22
+      // },
+      // "DrugCodes": [
+      //     1049997,
+      //     1052518,
+      //     1052594,
+      //     1052598,
+      //     1050231,
+      //     1048580,
+      //     1066660,
+      //     1049125,
+      //     1050215,
+      //     1048649,
+      //     1054917,
+      //     1051477
+      // ],
+      // "DiseaseCodes": [
+      //     "346",
+      //     "G43.909",
+      //     "D64.3",
+      //     "1052614"
+      // ],
+      // "AllergyCodes": [
+      //     83,
+      //     281,
+      //     306,
+      //     476,
+      //     543,
+      //     568,
+      //     571,
+      //     572,
+      //     590,
+      //     592,
+      //     593,
+      //     2715,
+      //     2755,
+      //     900028,
+      //     1088
+      // ],
+      // "Doses": [
+      //     {
+      //         "DrugName": "Amoxlin 450 mg",
+      //         "GCNSEQNO": 8997,
+      //         "ICDCode": "A181",
+      //         "DoseTypeIndicator": "02",
+      //         "Route": "064",
+      //         "Dose": {
+      //             "Value": 0.125,
+      //             "UOM": "G/DAY"
+      //         },
+      //         "Frequency": {
+      //             "Code": "QD"
+      //         },
+      //         "Duration": {
+      //             "Value": 1
+      //         }
+      //     },
+      //     {
+      //         "DrugName": "sghd",
+      //         "GCNSEQNO": 8997,
+      //         "ICDCode": "sdf",
+      //         "DoseTypeIndicator": "02",
+      //         "Route": "sd",
+      //         "Dose": {
+      //             "Value": 0.125,
+      //             "UOM": "G/DAY"
+      //         },
+      //         "Frequency": {
+      //             "Code": "QD"
+      //         },
+      //         "Duration": {
+      //             "Value": 1
+      //         }
+      //     }
+      // ]
+      Patient: {
+        Age: alertList === null || alertList === void 0 ? void 0 : alertList.age,
+        PatientName: alertList === null || alertList === void 0 ? void 0 : alertList.patientName,
+        Weight: alertList === null || alertList === void 0 ? void 0 : alertList.weight,
+        Height: alertList === null || alertList === void 0 ? void 0 : alertList.height,
+        CreatinineClearance: {
+          Value: alertList === null || alertList === void 0 ? void 0 : (_alertList$creatinine = alertList.creatinineClearance) === null || _alertList$creatinine === void 0 ? void 0 : _alertList$creatinine.Value,
+          UOM: alertList === null || alertList === void 0 ? void 0 : (_alertList$creatinine2 = alertList.creatinineClearance) === null || _alertList$creatinine2 === void 0 ? void 0 : _alertList$creatinine2.UOM
         },
-        "GestationalBirthAge": 22
+        GestationalBirthAge: alertList === null || alertList === void 0 ? void 0 : alertList.age
       },
-      "DrugCodes": [1049997, 1052518, 1052594, 1052598, 1050231, 1048580, 1066660, 1049125, 1050215, 1048649, 1054917, 1051477],
-      "DiseaseCodes": ["346", "G43.909", "D64.3", "1052614"],
-      "AllergyCodes": [83, 281, 306, 476, 543, 568, 571, 572, 590, 592, 593, 2715, 2755, 900028, 1088],
-      "Doses": [{
-        "DrugName": "Amoxlin 450 mg",
-        "GCNSEQNO": 8997,
-        "ICDCode": "A181",
-        "DoseTypeIndicator": "02",
-        "Route": "064",
-        "Dose": {
-          "Value": 0.125,
-          "UOM": "G/DAY"
+      DrugCodes: (_alertList$drugCodes = alertList === null || alertList === void 0 ? void 0 : alertList.drugCodes) !== null && _alertList$drugCodes !== void 0 ? _alertList$drugCodes : [],
+      DiseaseCodes: (_alertList$diseaseCod = alertList === null || alertList === void 0 ? void 0 : alertList.diseaseCodes) !== null && _alertList$diseaseCod !== void 0 ? _alertList$diseaseCod : [],
+      AllergyCodes: (_alertList$allergyCod = alertList === null || alertList === void 0 ? void 0 : alertList.allergyCodes) !== null && _alertList$allergyCod !== void 0 ? _alertList$allergyCod : [],
+      Doses: [{
+        DrugName: "Amoxlin 450 mg",
+        GCNSEQNO: 8997,
+        ICDCode: "A181",
+        DoseTypeIndicator: "02",
+        Route: "064",
+        Dose: {
+          Value: 0.125,
+          UOM: "G/DAY"
         },
-        "Frequency": {
-          "Code": "QD"
+        Frequency: {
+          Code: "QD"
         },
-        "Duration": {
-          "Value": 1
+        Duration: {
+          Value: 1
         }
       }]
     };
   }
 };
+var alertIntractionUpsert = {
+  UpsertAlertInterations: function UpsertAlertInterations(data) {
+    var _data$presType, _data$alerts, _data$alerts2, _data$addForm, _data$addForm$reason, _data$addForm2, _data$addForm3, _data$addForm3$reason;
+
+    return [{
+      db_name: dbName,
+      entity: "PH_OrderLineAlertLogs",
+      is_metadata: true,
+      metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
+      doc: {
+        id: 0,
+        orgEntityType: data === null || data === void 0 ? void 0 : data.orgEntityType,
+        org_Id: data === null || data === void 0 ? void 0 : data.orgId,
+        patient_Id: data === null || data === void 0 ? void 0 : data.patientid,
+        encountertype: data === null || data === void 0 ? void 0 : data.encountertype,
+        encounter_Id: data === null || data === void 0 ? void 0 : data.encounterid,
+        presType: data === null || data === void 0 ? void 0 : (_data$presType = data.presType) === null || _data$presType === void 0 ? void 0 : _data$presType.Value,
+        rxId: "string",
+        rxDate: data === null || data === void 0 ? void 0 : data.rxDate,
+        interactionMessage: [{
+          seqNo: 1,
+          reactionCode: data === null || data === void 0 ? void 0 : (_data$alerts = data.alerts) === null || _data$alerts === void 0 ? void 0 : _data$alerts.map(function (val) {
+            return val.RELATED_HIC_SEQN;
+          }),
+          alertMessage: data === null || data === void 0 ? void 0 : (_data$alerts2 = data.alerts) === null || _data$alerts2 === void 0 ? void 0 : _data$alerts2.map(function (val) {
+            return val.Message;
+          }),
+          overrideReasonCode: data === null || data === void 0 ? void 0 : (_data$addForm = data.addForm) === null || _data$addForm === void 0 ? void 0 : (_data$addForm$reason = _data$addForm.reason) === null || _data$addForm$reason === void 0 ? void 0 : _data$addForm$reason.label,
+          overrideNotes: data === null || data === void 0 ? void 0 : (_data$addForm2 = data.addForm) === null || _data$addForm2 === void 0 ? void 0 : _data$addForm2.Others,
+          overrideById: data === null || data === void 0 ? void 0 : (_data$addForm3 = data.addForm) === null || _data$addForm3 === void 0 ? void 0 : (_data$addForm3$reason = _data$addForm3.reason) === null || _data$addForm3$reason === void 0 ? void 0 : _data$addForm3$reason.label
+        }]
+      }
+    }];
+  }
+};
 
 var _extraReducers$5;
 var ALERT_INTERACTIONS = createAsyncThunk("alertIntractionsSlice/alertIntractions", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
       _ref2,
       rejectWithValue,
+      alertList,
       queriesjson,
       res,
+      alertInteratcion,
       _args = arguments;
 
   return regeneratorRuntime.wrap(function _callee$(_context) {
@@ -38658,10 +38932,8 @@ var ALERT_INTERACTIONS = createAsyncThunk("alertIntractionsSlice/alertIntraction
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-
-          _objectDestructuringEmpty(payload);
-
-          queriesjson = alertInteractionsQuery.alertInteractions();
+          alertList = payload.alertList;
+          queriesjson = alertInteractionsQuery.alertInteractions(alertList);
           _context.next = 7;
           return fetchData$3({
             body: JSON.stringify(queriesjson)
@@ -38669,28 +38941,82 @@ var ALERT_INTERACTIONS = createAsyncThunk("alertIntractionsSlice/alertIntraction
 
         case 7:
           res = _context.sent;
+          alertInteratcion = res.result.find(function (val) {
+            var keys = Object.keys(val);
+
+            if (keys.includes("Drug-AllergyIngredient-Interaction")) {
+              return true;
+            }
+
+            return false;
+          });
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-            data: res
+            data: alertInteratcion
           }));
 
-        case 11:
-          _context.prev = 11;
+        case 12:
+          _context.prev = 12;
           _context.t0 = _context["catch"](2);
           return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context.t0.message
           })));
 
-        case 14:
+        case 15:
         case "end":
           return _context.stop();
       }
     }
-  }, _callee, null, [[2, 11]]);
+  }, _callee, null, [[2, 12]]);
+})));
+var ALERT_INTERACTIONS_UPERT = createAsyncThunk("alertIntractionsSlice/alertInteraction_upsert", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+  var payload,
+      _ref4,
+      rejectWithValue,
+      list,
+      queriesjson,
+      res,
+      _args2 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
+    while (1) {
+      switch (_context2.prev = _context2.next) {
+        case 0:
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
+          _context2.prev = 2;
+          list = payload.list;
+          queriesjson = alertIntractionUpsert.UpsertAlertInterations(list);
+          _context2.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(queriesjson)
+          }, __uspsertUrl__);
+
+        case 7:
+          res = _context2.sent;
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: res
+          }));
+
+        case 11:
+          _context2.prev = 11;
+          _context2.t0 = _context2["catch"](2);
+          debugger;
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context2.t0.message
+          })));
+
+        case 15:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _callee2, null, [[2, 11]]);
 })));
 var alertIntractionsSlice = createSlice({
   name: "alertIntractionsSlice",
   initialState: {
-    alert_interactions: _objectSpread2({}, defaultState.Info)
+    alert_interactions: _objectSpread2({}, defaultState.Info),
+    alertInteraction_upsert: _objectSpread2({}, defaultState.Info)
   },
   extraReducers: (_extraReducers$5 = {}, _defineProperty(_extraReducers$5, ALERT_INTERACTIONS.fulfilled, function (state, action) {
     var _action$payload;
@@ -38702,10 +39028,21 @@ var alertIntractionsSlice = createSlice({
     var _action$payload2;
 
     state.alert_interactions.loading = false, state.alert_interactions.error = true, state.alert_interactions = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+  }), _defineProperty(_extraReducers$5, ALERT_INTERACTIONS_UPERT.fulfilled, function (state, action) {
+    var _action$payload3;
+
+    state.alertInteraction_upsert.loading = false, state.alertInteraction_upsert.error = false, state.alertInteraction_upsert = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
+  }), _defineProperty(_extraReducers$5, ALERT_INTERACTIONS_UPERT.pending, function (state, action) {
+    state.alertInteraction_upsert.error = false, state.alertInteraction_upsert.loading = true;
+  }), _defineProperty(_extraReducers$5, ALERT_INTERACTIONS_UPERT.rejected, function (state, action) {
+    var _action$payload4;
+
+    state.alertInteraction_upsert.loading = false, state.alertInteraction_upsert.error = true, state.alertInteraction_upsert = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
   }), _extraReducers$5)
 });
 var alertIntractionActions = {
-  ALERT_INTERACTIONS: ALERT_INTERACTIONS
+  ALERT_INTERACTIONS: ALERT_INTERACTIONS,
+  ALERT_INTERACTIONS_UPERT: ALERT_INTERACTIONS_UPERT
 };
 var alertIntractionsSlice$1 = alertIntractionsSlice.reducer;