primarycare-binder 1.1.116 → 1.1.120

package/dist/index.cjs.js

@@ -8073,7 +8073,7 @@ var queries$b = {
       db_name: "".concat(dbName),
       entity: "Encounter",
       filter: "Encounter.activestatus==true && Encounter._id=='".concat(encounter_id, "'"),
-      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:DOCUMENT(practdet.speciality)}))},{identifier: ( FOR IdentifierMaster IN IdentifierMaster FILTER IdentifierMaster._id in Encounter.identifier return merge(IdentifierMaster,{period:document(IdentifierMaster.period)}))},{statushistory:(for sat in TO_ARRAY(Encounter.statushistory) return merge(sat,{period:document(sat.period)}))})"
+      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:DOCUMENT(practdet.speciality)}))},{identifier: ( FOR IdentifierMaster IN IdentifierMaster FILTER IdentifierMaster._id in Encounter.identifier return merge(IdentifierMaster,{period:document(IdentifierMaster.period)}))},{statushistory:(for sat in TO_ARRAY(Encounter.statushistory) return merge(sat,{period:document(sat.period)}))},{type:document(Encounter.type)},{class:document(Encounter.class)})"
     };
   },
   get_apo_read: function get_apo_read(appointmentId) {
@@ -8360,6 +8360,7 @@ var __readDocumentUrl__ = "".concat(process.env.REACT_APP_BASE_URL_PROTOCAL, ":/
 var __deleteUrl__ = "".concat(process.env.REACT_APP_BASE_URL_PROTOCAL, "://").concat(process.env.REACT_APP_BASE_URL_HOST, ":").concat(process.env.REACT_APP_BASE_URL_PORT, "/api/delete_document");
 var __ruleBuilderUrl__ = "".concat(process.env.REACT_APP_RULE_BUILDER_URL, "/multi/rule-validate");
 
+var __TokenGeneration__ = "".concat(process.env.REACT_APP_TOKEN_URL, "/IDMJWTTokencreation");
 var __imgdownloadBaseUrl__ = "".concat(process.env.REACT_APP_IMAGE_UPLOAD_PROTOCAL || "https", "://").concat(process.env.REACT_APP_IMAGE_UPLOAD_HOST || "fileupload.dev.ainqaplatform.in", ":").concat(process.env.REACT_APP_IMAGE_UPLOAD_PORT || 443, "/").concat(dbName, "/");
 var __bookAppointmentUrl__ = "".concat(process.env.REACT_APP_AUTH_URL_PROTOCAL, "://").concat(process.env.REACT_APP_AUTH_URL_HOST, ":").concat(process.env.REACT_APP_AUTH_URL_PORT, "/api/v1/bookAppointment");
 var __modifyAppointmentUrl__ = "".concat(process.env.REACT_APP_AUTH_URL_PROTOCAL, "://").concat(process.env.REACT_APP_AUTH_URL_HOST, ":").concat(process.env.REACT_APP_AUTH_URL_PORT, "/api/v1/modifyAppointment");
@@ -9841,6 +9842,104 @@ var GET_IS_NURSE_TRIAGE_REQUIRED_BY_FACILITY = createAsyncThunk("authSlice/getIs
     }
   }, _callee18, null, [[2, 14]]);
 })));
+var GET_TOKEN = createAsyncThunk("authSlice/getToken", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
+  var payload,
+      _ref33,
+      rejectWithValue,
+      params,
+      data,
+      _args19 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee19$(_context19) {
+    while (1) {
+      switch (_context19.prev = _context19.next) {
+        case 0:
+          payload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
+          _ref33 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref33.rejectWithValue;
+          _context19.prev = 2;
+          params = payload.params;
+          _context19.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(params)
+          }, __TokenGeneration__);
+
+        case 6:
+          data = _context19.sent;
+          return _context19.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: data
+          }));
+
+        case 10:
+          _context19.prev = 10;
+          _context19.t0 = _context19["catch"](2);
+          return _context19.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context19.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context19.stop();
+      }
+    }
+  }, _callee19, null, [[2, 10]]);
+})));
+var JWT_TOKEN_PARAMS = createAsyncThunk("authSlice/jwtTokenParams", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
+  var payload,
+      _ref35,
+      rejectWithValue,
+      _data$result3,
+      _payload$emailId2,
+      emailId,
+      queries,
+      data,
+      res,
+      _args20 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee20$(_context20) {
+    while (1) {
+      switch (_context20.prev = _context20.next) {
+        case 0:
+          payload = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
+          _ref35 = _args20.length > 1 ? _args20[1] : undefined, rejectWithValue = _ref35.rejectWithValue;
+          _context20.prev = 2;
+          _payload$emailId2 = payload.emailId, emailId = _payload$emailId2 === void 0 ? "" : _payload$emailId2;
+          debugger;
+          queries = {
+            "db_name": dbName,
+            "entity": "Person,Practitioner",
+            "filter": {
+              "Person": "(document(document(Person.telecom)[*].system)[*].code == to_Array('email') || document(Person.telecom)[*].system any =='Email') && document(Person.telecom)[*].value any =='".concat(emailId, "' && Person.activestatus==true"),
+              "Practitioner": "Practitioner.PersonID == Person.Id && Practitioner.activestatus==true let oganid=(for Organization in Organization filter Organization.id == first(document(first(document(Practitioner.practitioner_role)[*].OrgID)).ParentOrgID) && Organization.activestatus==true return Organization) let enterid=(for Organization in Organization filter first(first(oganid).ParentOrgID)== Organization.id && Organization.activestatus==true return Organization)  let location=(for LocationMaster in LocationMaster filter LocationMaster.managingOrgID==first(document(Practitioner.practitioner_role)[*].OrgID) && LocationMaster.activestatus==true return LocationMaster)"
+            },
+            "return_fields": "{Person_id:Person._id,practitionerID:Practitioner._id,practitioner_role_id:first(Practitioner.practitioner_role),facilityid:first(document(Practitioner.practitioner_role)[*].OrgID),orgid:first(oganid)._id,enterpriseid:first(enterid)._id,locationid:first(location)._id}"
+          };
+          _context20.next = 8;
+          return fetchData$3({
+            body: JSON.stringify(queries)
+          }, __readDocumentUrl__);
+
+        case 8:
+          data = _context20.sent;
+          res = data === null || data === void 0 ? void 0 : (_data$result3 = data.result) === null || _data$result3 === void 0 ? void 0 : _data$result3[0];
+          debugger;
+          return _context20.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: res
+          }));
+
+        case 14:
+          _context20.prev = 14;
+          _context20.t0 = _context20["catch"](2);
+          return _context20.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context20.t0.message
+          })));
+
+        case 17:
+        case "end":
+          return _context20.stop();
+      }
+    }
+  }, _callee20, null, [[2, 14]]);
+})));
 var authSlice = createSlice({
   name: "authSlice",
   initialState: {
@@ -9862,7 +9961,9 @@ var authSlice = createSlice({
     refreshToken: _objectSpread2({}, defaultState.Info),
     country_code_list: _objectSpread2({}, defaultState.Info),
     getFacilityByUserid: _objectSpread2({}, defaultState.Info),
-    getIsNurseTriageRequiredByFacility: _objectSpread2({}, defaultState.Info)
+    getIsNurseTriageRequiredByFacility: _objectSpread2({}, defaultState.Info),
+    getToken: _objectSpread2({}, defaultState.Info),
+    jwtTokenParams: _objectSpread2({}, defaultState.Info)
   },
   extraReducers: (_extraReducers$G = {}, _defineProperty(_extraReducers$G, REGISTER_USERS.fulfilled, function (state, action) {
     var _action$payload;
@@ -10034,6 +10135,26 @@ var authSlice = createSlice({
     var _action$payload34;
 
     state.getIsNurseTriageRequiredByFacility = (_action$payload34 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload34 !== void 0 ? _action$payload34 : {};
+  }), _defineProperty(_extraReducers$G, GET_TOKEN.fulfilled, function (state, action) {
+    var _action$payload35;
+
+    state.getToken = (_action$payload35 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload35 !== void 0 ? _action$payload35 : {};
+  }), _defineProperty(_extraReducers$G, GET_TOKEN.pending, function (state, action) {
+    state.getToken.loading = true;
+  }), _defineProperty(_extraReducers$G, GET_TOKEN.rejected, function (state, action) {
+    var _action$payload36;
+
+    state.getToken = (_action$payload36 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload36 !== void 0 ? _action$payload36 : {};
+  }), _defineProperty(_extraReducers$G, JWT_TOKEN_PARAMS.fulfilled, function (state, action) {
+    var _action$payload37;
+
+    state.jwtTokenParams = (_action$payload37 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload37 !== void 0 ? _action$payload37 : {};
+  }), _defineProperty(_extraReducers$G, JWT_TOKEN_PARAMS.pending, function (state, action) {
+    state.jwtTokenParams.loading = true;
+  }), _defineProperty(_extraReducers$G, JWT_TOKEN_PARAMS.rejected, function (state, action) {
+    var _action$payload38;
+
+    state.jwtTokenParams = (_action$payload38 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload38 !== void 0 ? _action$payload38 : {};
   }), _extraReducers$G)
 });
 var authActions = {
@@ -10053,7 +10174,9 @@ var authActions = {
   REFRESH_TOKEN: REFRESH_TOKEN,
   GET_COUNTRY_CODE_LIST: GET_COUNTRY_CODE_LIST,
   GET_FACILITY_BY_USERID: GET_FACILITY_BY_USERID,
-  GET_IS_NURSE_TRIAGE_REQUIRED_BY_FACILITY: GET_IS_NURSE_TRIAGE_REQUIRED_BY_FACILITY
+  GET_IS_NURSE_TRIAGE_REQUIRED_BY_FACILITY: GET_IS_NURSE_TRIAGE_REQUIRED_BY_FACILITY,
+  GET_TOKEN: GET_TOKEN,
+  JWT_TOKEN_PARAMS: JWT_TOKEN_PARAMS
 };
 var authSlice$1 = authSlice.reducer;
 
@@ -12328,6 +12451,8 @@ var QUEUE_MANAGEMENT = createAsyncThunk("appointmentReducer/queueManagement", /*
       isNurse,
       _payload$isFrontDesk,
       isFrontDesk,
+      _payload$nameOfOrg,
+      nameOfOrg,
       body,
       data,
       returnData,
@@ -12340,7 +12465,7 @@ var QUEUE_MANAGEMENT = createAsyncThunk("appointmentReducer/queueManagement", /*
           payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
           _ref25 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref25.rejectWithValue;
           _context12.prev = 2;
-          _payload$start2 = payload.start, start = _payload$start2 === void 0 ? 0 : _payload$start2, _payload$end = payload.end, end = _payload$end === void 0 ? 0 : _payload$end, _payload$OrgID = payload.OrgID, OrgID = _payload$OrgID === void 0 ? 0 : _payload$OrgID, _payload$login = payload.login, login = _payload$login === void 0 ? 0 : _payload$login, _payload$specialtyId = payload.specialtyId, specialtyId = _payload$specialtyId === void 0 ? 0 : _payload$specialtyId, _payload$isDoctor = payload.isDoctor, isDoctor = _payload$isDoctor === void 0 ? false : _payload$isDoctor, _payload$isNurse = payload.isNurse, isNurse = _payload$isNurse === void 0 ? false : _payload$isNurse, _payload$isFrontDesk = payload.isFrontDesk, isFrontDesk = _payload$isFrontDesk === void 0 ? false : _payload$isFrontDesk;
+          _payload$start2 = payload.start, start = _payload$start2 === void 0 ? 0 : _payload$start2, _payload$end = payload.end, end = _payload$end === void 0 ? 0 : _payload$end, _payload$OrgID = payload.OrgID, OrgID = _payload$OrgID === void 0 ? 0 : _payload$OrgID, _payload$login = payload.login, login = _payload$login === void 0 ? 0 : _payload$login, _payload$specialtyId = payload.specialtyId, specialtyId = _payload$specialtyId === void 0 ? 0 : _payload$specialtyId, _payload$isDoctor = payload.isDoctor, isDoctor = _payload$isDoctor === void 0 ? false : _payload$isDoctor, _payload$isNurse = payload.isNurse, isNurse = _payload$isNurse === void 0 ? false : _payload$isNurse, _payload$isFrontDesk = payload.isFrontDesk, isFrontDesk = _payload$isFrontDesk === void 0 ? false : _payload$isFrontDesk, _payload$nameOfOrg = payload.nameOfOrg, nameOfOrg = _payload$nameOfOrg === void 0 ? "" : _payload$nameOfOrg;
           body = isDoctor ? {
             db_name: dbName,
             queryid: query_ids["appointmentReducer/queueManagementDoctor"],
@@ -12365,7 +12490,8 @@ var QUEUE_MANAGEMENT = createAsyncThunk("appointmentReducer/queueManagement", /*
             filter: {
               start: start,
               end: end,
-              OrgID: OrgID
+              OrgID: OrgID,
+              org_id: nameOfOrg
             }
           };
           _context12.next = 7;
@@ -15710,7 +15836,7 @@ var GET_ENCOUNTER_MASTER_TYPE = createAsyncThunk('searchApiSlice/masterEncounter
             "db_name": "primarycare",
             "entity": "AMPatientClass",
             "filter": "AMPatientClass.status==true && AMPatientClass.activestatus==true",
-            "return_fields": "keep(AMPatientClass,'_id','_key','id','shortDesc','longDesc','status')",
+            "return_fields": "keep(AMPatientClass,'_id','_key','id', 'encType', 'shortDesc','longDesc','status')",
             "sort": "AMPatientClass.shortDesc"
           };
           _context10.next = 7;
@@ -15771,7 +15897,7 @@ var GET_ENCOUNTER_MASTER_CLASS = createAsyncThunk('searchApiSlice/masterEncounte
           encounterClassBody = {
             "db_name": "primarycare",
             "entity": "AMPatientClass",
-            "filter": "AMPatientClass._id=='".concat(encType, "' && AMPatientClass.status==true && AMPatientClass.activestatus==true"),
+            "filter": "AMPatientClass.encType=='".concat(encType, "' && AMPatientClass.status==true && AMPatientClass.activestatus==true"),
             "return_fields": "{encClsByTypes:AMPatientClass.encClsByTypes}"
           };
           _context11.next = 8;
@@ -20438,7 +20564,8 @@ var dashboardQuery = {
           }],
           specialty: data === null || data === void 0 ? void 0 : data.specialty
         }],
-        participantHistory: data === null || data === void 0 ? void 0 : data.participantHistory
+        participantHistory: data === null || data === void 0 ? void 0 : data.participantHistory,
+        practitioner_details: data === null || data === void 0 ? void 0 : data.practitioner_details
       }
     }];
   },
@@ -20475,6 +20602,21 @@ var dashboardQuery = {
       return_fields: // "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{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)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))},{Followupdetails:(for app in AppointmentRequest filter app.encounterid==Encounter._id return merge(app,{followupduruom:document(app.followupduruom)},{followupreason:document(app.followupreason)}))})",
       "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))}, {statushistoryExp:(for she in Encounter.statushistory return merge(she,{period:document(she.period)},{status:document(she.status)}))} , {reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{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)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))},{Followupdetails:(for app in AppointmentRequest filter app.encounterid==Encounter._id return merge(app,{followupduruom:document(app.followupduruom)},{followupreason:document(app.followupreason)}))})"
     };
+  },
+  appointmentResourceCodeUpdate: function appointmentResourceCodeUpdate(appID, resourceCode, practId) {
+    return [{
+      "db_name": dbName,
+      "entity": "Appointment",
+      "is_metadata": true,
+      "filter": {
+        "_key": "".concat(appID)
+      },
+      "metadataId": "04ecb73d-f048-44ce-8563-c9be015812dd",
+      "doc": {
+        "resourcecode": "".concat(resourceCode),
+        "practitionerID": [Number(practId)]
+      }
+    }];
   }
 };
 var visitQuery = {
@@ -22157,7 +22299,7 @@ var ASSIGN_PRACTITIONER_LIST = createAsyncThunk("dashboardApiSlice/assignPractit
           data = _context25.sent;
           arry = [];
           data === null || data === void 0 ? void 0 : (_data$result9 = data.result) === null || _data$result9 === void 0 ? void 0 : _data$result9.map(function (val) {
-            var _makeName, _val$name, _val$photo$, _val$photo, _val$_id6, _val$_key, _val$id, _val$assignedpatient, _val$id2, _val$practitioner_rol, _val$practitioner_rol2, _val$practitioner_rol3;
+            var _makeName, _val$name, _val$photo$, _val$photo, _val$_id6, _val$_key, _val$id, _val$assignedpatient, _val$id2, _val$practitioner_rol, _val$practitioner_rol2, _val$practitioner_rol3, _val$_id7, _val$practitioner_rol4, _val$practitioner_rol5, _val$practitioner_rol6;
 
             arry.push({
               name: (_makeName = makeName(val === null || val === void 0 ? void 0 : (_val$name = val.name) === null || _val$name === void 0 ? void 0 : _val$name[0])) !== null && _makeName !== void 0 ? _makeName : "",
@@ -22167,7 +22309,9 @@ var ASSIGN_PRACTITIONER_LIST = createAsyncThunk("dashboardApiSlice/assignPractit
               id: (_val$id = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id !== void 0 ? _val$id : "",
               appointmentCount: (_val$assignedpatient = val === null || val === void 0 ? void 0 : val.assignedpatient) !== null && _val$assignedpatient !== void 0 ? _val$assignedpatient : "",
               Practitioner_id: (_val$id2 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id2 !== void 0 ? _val$id2 : "",
-              PractitionerRole_id: (_val$practitioner_rol = val === null || val === void 0 ? void 0 : (_val$practitioner_rol2 = val.practitioner_role) === null || _val$practitioner_rol2 === void 0 ? void 0 : (_val$practitioner_rol3 = _val$practitioner_rol2[0]) === null || _val$practitioner_rol3 === void 0 ? void 0 : _val$practitioner_rol3.id) !== null && _val$practitioner_rol !== void 0 ? _val$practitioner_rol : ""
+              PractitionerRole_id: (_val$practitioner_rol = val === null || val === void 0 ? void 0 : (_val$practitioner_rol2 = val.practitioner_role) === null || _val$practitioner_rol2 === void 0 ? void 0 : (_val$practitioner_rol3 = _val$practitioner_rol2[0]) === null || _val$practitioner_rol3 === void 0 ? void 0 : _val$practitioner_rol3.id) !== null && _val$practitioner_rol !== void 0 ? _val$practitioner_rol : "",
+              pract_id: (_val$_id7 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id7 !== void 0 ? _val$_id7 : "",
+              pract_role_id: (_val$practitioner_rol4 = val === null || val === void 0 ? void 0 : (_val$practitioner_rol5 = val.practitioner_role) === null || _val$practitioner_rol5 === void 0 ? void 0 : (_val$practitioner_rol6 = _val$practitioner_rol5[0]) === null || _val$practitioner_rol6 === void 0 ? void 0 : _val$practitioner_rol6._id) !== null && _val$practitioner_rol4 !== void 0 ? _val$practitioner_rol4 : ""
             });
           });
           return _context25.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -22274,6 +22418,53 @@ var REASSIGN_PRACTITIONER_UPDATE = createAsyncThunk("dashboardApiSlice/reassignP
       }
     }
   }, _callee27, null, [[2, 10]]);
+}))); //UPSERT_APPOINTMENT
+
+var UPSERT_APPOINTMENT = createAsyncThunk("dashboardApiSlice/appointmentUpsert", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
+  var payload,
+      _ref56,
+      rejectWithValue,
+      appID,
+      resourceCode,
+      practId,
+      data__,
+      _args28 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee28$(_context28) {
+    while (1) {
+      switch (_context28.prev = _context28.next) {
+        case 0:
+          payload = _args28.length > 0 && _args28[0] !== undefined ? _args28[0] : {};
+          _ref56 = _args28.length > 1 ? _args28[1] : undefined, rejectWithValue = _ref56.rejectWithValue;
+          _context28.prev = 2;
+          appID = payload.appID, resourceCode = payload.resourceCode, practId = payload.practId;
+          debugger;
+          _context28.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(dashboardQuery.appointmentResourceCodeUpdate(appID, resourceCode, practId))
+          }, __uspsertUrl__);
+
+        case 7:
+          data__ = _context28.sent;
+          debugger;
+          return _context28.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: data__
+          }));
+
+        case 12:
+          _context28.prev = 12;
+          _context28.t0 = _context28["catch"](2);
+          alert("error");
+          return _context28.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context28.t0.message
+          })));
+
+        case 16:
+        case "end":
+          return _context28.stop();
+      }
+    }
+  }, _callee28, null, [[2, 12]]);
 })));
 
 var constructStatusHistory = function constructStatusHistory(data, status) {
@@ -22288,9 +22479,9 @@ var constructStatusHistory = function constructStatusHistory(data, status) {
 }; //CLOSE_CONSULTATION_UPDATE
 
 
-var CLOSE_CONSULTATION_UPDATE = createAsyncThunk("dashboardApiSlice/closeConsultationUpdate", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
+var CLOSE_CONSULTATION_UPDATE = createAsyncThunk("dashboardApiSlice/closeConsultationUpdate", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
   var payload,
-      _ref56,
+      _ref58,
       rejectWithValue,
       _encounterCode$result,
       _encounterCode$result2,
@@ -22300,17 +22491,17 @@ var CLOSE_CONSULTATION_UPDATE = createAsyncThunk("dashboardApiSlice/closeConsult
       encounterStatus,
       statusHistor,
       data_,
-      _args28 = arguments;
+      _args29 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee28$(_context28) {
+  return regeneratorRuntime.wrap(function _callee29$(_context29) {
     while (1) {
-      switch (_context28.prev = _context28.next) {
+      switch (_context29.prev = _context29.next) {
         case 0:
-          payload = _args28.length > 0 && _args28[0] !== undefined ? _args28[0] : {};
-          _ref56 = _args28.length > 1 ? _args28[1] : undefined, rejectWithValue = _ref56.rejectWithValue;
-          _context28.prev = 2;
+          payload = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
+          _ref58 = _args29.length > 1 ? _args29[1] : undefined, rejectWithValue = _ref58.rejectWithValue;
+          _context29.prev = 2;
           data = payload.data;
-          _context28.next = 6;
+          _context29.next = 6;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -22321,34 +22512,34 @@ var CLOSE_CONSULTATION_UPDATE = createAsyncThunk("dashboardApiSlice/closeConsult
           }, __readDocumentUrl__);
 
         case 6:
-          encounterCode = _context28.sent;
+          encounterCode = _context29.sent;
           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 : "";
           statusHistor = constructStatusHistory(data, encounterStatus);
-          _context28.next = 11;
+          _context29.next = 11;
           return fetchData$3({
             body: JSON.stringify(dashboardQuery.closeConsultationUpdate(data, encounterStatus, statusHistor))
           }, __uspsertUrl__);
 
         case 11:
-          data_ = _context28.sent;
-          return _context28.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          data_ = _context29.sent;
+          return _context29.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: data_
           }));
 
         case 15:
-          _context28.prev = 15;
-          _context28.t0 = _context28["catch"](2);
+          _context29.prev = 15;
+          _context29.t0 = _context29["catch"](2);
           alert("error");
-          return _context28.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context28.t0.message
+          return _context29.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context29.t0.message
           })));
 
         case 19:
         case "end":
-          return _context28.stop();
+          return _context29.stop();
       }
     }
-  }, _callee28, null, [[2, 15]]);
+  }, _callee29, null, [[2, 15]]);
 })));
 var dashboardApiSlice = createSlice({
   name: "dashboardApiSlice",
@@ -22377,6 +22568,7 @@ var dashboardApiSlice = createSlice({
     assignPractitionerList: _objectSpread2({}, defaultState.Info),
     assignPractitionerUpdate: _objectSpread2({}, defaultState.Info),
     reassignPractitionerUpdate: _objectSpread2({}, defaultState.Info),
+    appointmentUpsert: _objectSpread2({}, defaultState.Info),
     //CLOSE CONSULTATION MASTER
     dispositionType: _objectSpread2({}, defaultState.Info),
     followupUOM: _objectSpread2({}, defaultState.Info),
@@ -22624,46 +22816,56 @@ var dashboardApiSlice = createSlice({
     var _action$payload48;
 
     state.reassignPractitionerUpdate = (_action$payload48 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload48 !== void 0 ? _action$payload48 : {};
-  }), _defineProperty(_extraReducers$p, DISPOSITION_TYPE.fulfilled, function (state, action) {
+  }), _defineProperty(_extraReducers$p, UPSERT_APPOINTMENT.fulfilled, function (state, action) {
     var _action$payload49;
 
-    state.dispositionType = (_action$payload49 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload49 !== void 0 ? _action$payload49 : {};
+    state.appointmentUpsert = (_action$payload49 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload49 !== void 0 ? _action$payload49 : {};
+  }), _defineProperty(_extraReducers$p, UPSERT_APPOINTMENT.pending, function (state, action) {
+    state.appointmentUpsert.loading = true;
+  }), _defineProperty(_extraReducers$p, UPSERT_APPOINTMENT.rejected, function (state, action) {
+    var _action$payload50;
+
+    state.appointmentUpsert = (_action$payload50 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload50 !== void 0 ? _action$payload50 : {};
+  }), _defineProperty(_extraReducers$p, DISPOSITION_TYPE.fulfilled, function (state, action) {
+    var _action$payload51;
+
+    state.dispositionType = (_action$payload51 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload51 !== void 0 ? _action$payload51 : {};
   }), _defineProperty(_extraReducers$p, DISPOSITION_TYPE.pending, function (state, action) {
     state.dispositionType.loading = true;
   }), _defineProperty(_extraReducers$p, DISPOSITION_TYPE.rejected, function (state, action) {
-    var _action$payload50;
+    var _action$payload52;
 
-    state.dispositionType = (_action$payload50 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload50 !== void 0 ? _action$payload50 : {};
+    state.dispositionType = (_action$payload52 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload52 !== void 0 ? _action$payload52 : {};
   }), _defineProperty(_extraReducers$p, FOLLOWUPUOM.fulfilled, function (state, action) {
-    var _action$payload51;
+    var _action$payload53;
 
-    state.followupUOM = (_action$payload51 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload51 !== void 0 ? _action$payload51 : {};
+    state.followupUOM = (_action$payload53 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload53 !== void 0 ? _action$payload53 : {};
   }), _defineProperty(_extraReducers$p, FOLLOWUPUOM.pending, function (state, action) {
     state.followupUOM.loading = true;
   }), _defineProperty(_extraReducers$p, FOLLOWUPUOM.rejected, function (state, action) {
-    var _action$payload52;
+    var _action$payload54;
 
-    state.followupUOM = (_action$payload52 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload52 !== void 0 ? _action$payload52 : {};
+    state.followupUOM = (_action$payload54 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload54 !== void 0 ? _action$payload54 : {};
   }), _defineProperty(_extraReducers$p, REASON_MASTER.fulfilled, function (state, action) {
-    var _action$payload53;
+    var _action$payload55;
 
-    state.reasonMaster = (_action$payload53 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload53 !== void 0 ? _action$payload53 : {};
+    state.reasonMaster = (_action$payload55 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload55 !== void 0 ? _action$payload55 : {};
   }), _defineProperty(_extraReducers$p, REASON_MASTER.pending, function (state, action) {
     state.reasonMaster.loading = true;
   }), _defineProperty(_extraReducers$p, REASON_MASTER.rejected, function (state, action) {
-    var _action$payload54;
+    var _action$payload56;
 
-    state.reasonMaster = (_action$payload54 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload54 !== void 0 ? _action$payload54 : {};
+    state.reasonMaster = (_action$payload56 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload56 !== void 0 ? _action$payload56 : {};
   }), _defineProperty(_extraReducers$p, CLOSE_CONSULTATION_UPDATE.fulfilled, function (state, action) {
-    var _action$payload55;
+    var _action$payload57;
 
-    state.closeConsultationUpdate = (_action$payload55 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload55 !== void 0 ? _action$payload55 : {};
+    state.closeConsultationUpdate = (_action$payload57 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload57 !== void 0 ? _action$payload57 : {};
   }), _defineProperty(_extraReducers$p, CLOSE_CONSULTATION_UPDATE.pending, function (state, action) {
     state.closeConsultationUpdate.loading = true;
   }), _defineProperty(_extraReducers$p, CLOSE_CONSULTATION_UPDATE.rejected, function (state, action) {
-    var _action$payload56;
+    var _action$payload58;
 
-    state.closeConsultationUpdate = (_action$payload56 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload56 !== void 0 ? _action$payload56 : {};
+    state.closeConsultationUpdate = (_action$payload58 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload58 !== void 0 ? _action$payload58 : {};
   }), _extraReducers$p)
 });
 var dashboardApiActions = {
@@ -22694,7 +22896,8 @@ var dashboardApiActions = {
   FOLLOWUPUOM: FOLLOWUPUOM,
   REASON_MASTER: REASON_MASTER,
   CLOSE_CONSULTATION_UPDATE: CLOSE_CONSULTATION_UPDATE,
-  TODAY_VISIT: TODAY_VISIT
+  TODAY_VISIT: TODAY_VISIT,
+  UPSERT_APPOINTMENT: UPSERT_APPOINTMENT
 };
 var dashboardApiSlice$1 = dashboardApiSlice.reducer;
 
@@ -23794,7 +23997,7 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
           data = _context12.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$Patient, _val$Patient$, _val$Patient$$communi, _val$_id, _val$_id$split, _val$practitioner_det, _val$practitioner_det2, _val$practitioner_det3, _val$practitioner_det4, _val$practitioner_det5, _val$Patient2, _val$Patient2$, _val$Patient2$$name, _val$Patient3, _val$Patient3$, _val$Patient4, _val$Patient4$, _val$Patient5, _val$Patient5$, _val$Patient5$$gender, _val$Patient6, _val$Patient6$, _val$Patient$0$pident, _val$Patient7, _val$Patient7$, _val$Patient7$$pident, _val$Patient7$$pident2, _lang, _val$Patient8, _val$Patient8$, _val$Patient8$$person, _val$Patient8$$person2, _val$Patient8$$person3, _val$Patient8$$person4, _val$Patient9, _val$Patient9$, _val$Patient9$$photo, _val$Patient9$$photo$, _val$practitioner_det6, _val$practitioner_det7, _val$practitioner_det8;
+            var _val$Patient, _val$Patient$, _val$Patient$$communi, _val$_id, _val$_id$split, _val$practitioner_det, _val$practitioner_det2, _val$practitioner_det3, _val$practitioner_det4, _val$practitioner_det5, _val$Patient2, _val$Patient2$, _val$Patient2$$name, _val$Patient3, _val$Patient3$, _val$Patient4, _val$Patient4$, _val$Patient5, _val$Patient5$, _val$Patient6, _val$Patient6$, _val$Patient6$$gender, _val$Patient7, _val$Patient7$, _val$Patient$0$pident, _val$Patient8, _val$Patient8$, _val$Patient8$$pident, _val$Patient8$$pident2, _lang, _val$Patient9, _val$Patient9$, _val$Patient9$$person, _val$Patient9$$person2, _val$Patient9$$person3, _val$Patient9$$person4, _val$Patient10, _val$Patient10$, _val$Patient10$$photo, _val$Patient10$$photo2, _val$practitioner_det6, _val$practitioner_det7, _val$practitioner_det8;
 
             var lang = val === null || val === void 0 ? void 0 : (_val$Patient = val.Patient) === null || _val$Patient === void 0 ? void 0 : (_val$Patient$ = _val$Patient[0]) === null || _val$Patient$ === void 0 ? void 0 : (_val$Patient$$communi = _val$Patient$.communicationLanguage) === null || _val$Patient$$communi === void 0 ? void 0 : _val$Patient$$communi.map(function (val) {
               return val.display;
@@ -23810,12 +24013,13 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
               // name: val?.Patient?.[0]?.name?.[0]?.text ?? "",
               name: makeName(val === null || val === void 0 ? void 0 : (_val$Patient2 = val.Patient) === null || _val$Patient2 === void 0 ? void 0 : (_val$Patient2$ = _val$Patient2[0]) === null || _val$Patient2$ === void 0 ? void 0 : (_val$Patient2$$name = _val$Patient2$.name) === null || _val$Patient2$$name === void 0 ? void 0 : _val$Patient2$$name[0]),
               pID: val === null || val === void 0 ? void 0 : (_val$Patient3 = val.Patient) === null || _val$Patient3 === void 0 ? void 0 : (_val$Patient3$ = _val$Patient3[0]) === null || _val$Patient3$ === void 0 ? void 0 : _val$Patient3$._id,
-              mrn: val === null || val === void 0 ? void 0 : (_val$Patient4 = val.Patient) === null || _val$Patient4 === void 0 ? void 0 : (_val$Patient4$ = _val$Patient4[0]) === null || _val$Patient4$ === void 0 ? void 0 : _val$Patient4$.alias,
-              gender: val === null || val === void 0 ? void 0 : (_val$Patient5 = val.Patient) === null || _val$Patient5 === void 0 ? void 0 : (_val$Patient5$ = _val$Patient5[0]) === null || _val$Patient5$ === void 0 ? void 0 : (_val$Patient5$$gender = _val$Patient5$.gender) === null || _val$Patient5$$gender === void 0 ? void 0 : _val$Patient5$$gender.display,
-              dob: val === null || val === void 0 ? void 0 : (_val$Patient6 = val.Patient) === null || _val$Patient6 === void 0 ? void 0 : (_val$Patient6$ = _val$Patient6[0]) === null || _val$Patient6$ === void 0 ? void 0 : _val$Patient6$.birthDate,
-              pidentifier: (_val$Patient$0$pident = val === null || val === void 0 ? void 0 : (_val$Patient7 = val.Patient) === null || _val$Patient7 === void 0 ? void 0 : (_val$Patient7$ = _val$Patient7[0]) === null || _val$Patient7$ === void 0 ? void 0 : (_val$Patient7$$pident = _val$Patient7$.pidentifier) === null || _val$Patient7$$pident === void 0 ? void 0 : (_val$Patient7$$pident2 = _val$Patient7$$pident[0]) === null || _val$Patient7$$pident2 === void 0 ? void 0 : _val$Patient7$$pident2.value) !== null && _val$Patient$0$pident !== void 0 ? _val$Patient$0$pident : "",
+              patientid: val === null || val === void 0 ? void 0 : (_val$Patient4 = val.Patient) === null || _val$Patient4 === void 0 ? void 0 : (_val$Patient4$ = _val$Patient4[0]) === null || _val$Patient4$ === void 0 ? void 0 : _val$Patient4$.id,
+              mrn: val === null || val === void 0 ? void 0 : (_val$Patient5 = val.Patient) === null || _val$Patient5 === void 0 ? void 0 : (_val$Patient5$ = _val$Patient5[0]) === null || _val$Patient5$ === void 0 ? void 0 : _val$Patient5$.alias,
+              gender: val === null || val === void 0 ? void 0 : (_val$Patient6 = val.Patient) === null || _val$Patient6 === void 0 ? void 0 : (_val$Patient6$ = _val$Patient6[0]) === null || _val$Patient6$ === void 0 ? void 0 : (_val$Patient6$$gender = _val$Patient6$.gender) === null || _val$Patient6$$gender === void 0 ? void 0 : _val$Patient6$$gender.display,
+              dob: val === null || val === void 0 ? void 0 : (_val$Patient7 = val.Patient) === null || _val$Patient7 === void 0 ? void 0 : (_val$Patient7$ = _val$Patient7[0]) === null || _val$Patient7$ === void 0 ? void 0 : _val$Patient7$.birthDate,
+              pidentifier: (_val$Patient$0$pident = val === null || val === void 0 ? void 0 : (_val$Patient8 = val.Patient) === null || _val$Patient8 === void 0 ? void 0 : (_val$Patient8$ = _val$Patient8[0]) === null || _val$Patient8$ === void 0 ? void 0 : (_val$Patient8$$pident = _val$Patient8$.pidentifier) === null || _val$Patient8$$pident === void 0 ? void 0 : (_val$Patient8$$pident2 = _val$Patient8$$pident[0]) === null || _val$Patient8$$pident2 === void 0 ? void 0 : _val$Patient8$$pident2.value) !== null && _val$Patient$0$pident !== void 0 ? _val$Patient$0$pident : "",
               lang: (_lang = lang) === null || _lang === void 0 ? void 0 : _lang.join(", "),
-              img: getImgUrl(val === null || val === void 0 ? void 0 : (_val$Patient8 = val.Patient) === null || _val$Patient8 === void 0 ? void 0 : (_val$Patient8$ = _val$Patient8[0]) === null || _val$Patient8$ === void 0 ? void 0 : (_val$Patient8$$person = _val$Patient8$.personInfo) === null || _val$Patient8$$person === void 0 ? void 0 : (_val$Patient8$$person2 = _val$Patient8$$person[0]) === null || _val$Patient8$$person2 === void 0 ? void 0 : (_val$Patient8$$person3 = _val$Patient8$$person2.photo) === null || _val$Patient8$$person3 === void 0 ? void 0 : (_val$Patient8$$person4 = _val$Patient8$$person3[0]) === null || _val$Patient8$$person4 === void 0 ? void 0 : _val$Patient8$$person4.fileid) || getImgUrl(val === null || val === void 0 ? void 0 : (_val$Patient9 = val.Patient) === null || _val$Patient9 === void 0 ? void 0 : (_val$Patient9$ = _val$Patient9[0]) === null || _val$Patient9$ === void 0 ? void 0 : (_val$Patient9$$photo = _val$Patient9$.photo) === null || _val$Patient9$$photo === void 0 ? void 0 : (_val$Patient9$$photo$ = _val$Patient9$$photo[0]) === null || _val$Patient9$$photo$ === void 0 ? void 0 : _val$Patient9$$photo$.fileid),
+              img: getImgUrl(val === null || val === void 0 ? void 0 : (_val$Patient9 = val.Patient) === null || _val$Patient9 === void 0 ? void 0 : (_val$Patient9$ = _val$Patient9[0]) === null || _val$Patient9$ === void 0 ? void 0 : (_val$Patient9$$person = _val$Patient9$.personInfo) === null || _val$Patient9$$person === void 0 ? void 0 : (_val$Patient9$$person2 = _val$Patient9$$person[0]) === null || _val$Patient9$$person2 === void 0 ? void 0 : (_val$Patient9$$person3 = _val$Patient9$$person2.photo) === null || _val$Patient9$$person3 === void 0 ? void 0 : (_val$Patient9$$person4 = _val$Patient9$$person3[0]) === null || _val$Patient9$$person4 === void 0 ? void 0 : _val$Patient9$$person4.fileid) || getImgUrl(val === null || val === void 0 ? void 0 : (_val$Patient10 = val.Patient) === null || _val$Patient10 === void 0 ? void 0 : (_val$Patient10$ = _val$Patient10[0]) === null || _val$Patient10$ === void 0 ? void 0 : (_val$Patient10$$photo = _val$Patient10$.photo) === null || _val$Patient10$$photo === void 0 ? void 0 : (_val$Patient10$$photo2 = _val$Patient10$$photo[0]) === null || _val$Patient10$$photo2 === void 0 ? void 0 : _val$Patient10$$photo2.fileid),
               facilityName: (_val$practitioner_det6 = (_val$practitioner_det7 = val.practitioner_details) === null || _val$practitioner_det7 === void 0 ? void 0 : (_val$practitioner_det8 = _val$practitioner_det7[0]) === null || _val$practitioner_det8 === void 0 ? void 0 : _val$practitioner_det8.clinic) !== null && _val$practitioner_det6 !== void 0 ? _val$practitioner_det6 : ""
             });
           });
@@ -25443,7 +25647,7 @@ var radOrderActions = _objectSpread2({}, actionInfo$3);
 var radOrderSlice$1 = radOrderSlice.reducer;
 
 var generateJSON$6 = function generateJSON(payload, orgId) {
-  var _payload$patientid, _payload$encountertyp, _payload$encounterid, _payload$prescription, _payload$Prescription, _payload$name$drugTyp, _payload$name, _payload$presNature$v, _payload$presNature, _payload$presMode$val, _payload$presMode, _payload$priority$val, _payload$priority, _payload$status, _payload$statusreason, _payload$intent, _payload$orderPrivile, _payload$privilegeAle, _payload$workFlowStat, _payload$name$value, _payload$name2, _payload$formCode, _payload$routeCode$va, _payload$routeCode, _payload$dosageTypeIn, _payload$unitValue$va, _payload$unitValue, _payload$drug_categor, _payload$drug_categor2, _payload$dispensing_p, _payload$dispensing_p2, _payload$IVDosageDura, _payload$IVDosageDura2, _payload$unitsTypes$v, _payload$unitsTypes, _payload$ivInfusionRa, _payload$ivInfusionRa2, _payload$doseOption$v, _payload$doseOption, _payload$occurStartDa, _payload$occurEndDate, _payload$totPresQtyUO, _payload$totPresQtyUO2, _payload$totDispQty, _payload$totDispQtyUO, _payload$totBilledQty, _payload$totBilledQty2, _payload$totReturnedQ, _payload$PRNYN, _payload$prnComment, _payload$direction, _payload$diagnosis, _payload$reasonCode, _payload$indication$v, _payload$indication, _payload$patientInstr, _payload$patientInstr2, _payload$patientInstr3, _payload$notes, _payload$parentPresId, _payload$presGroupRef, _payload$noofRefillsA, _payload$initialDispe, _payload$refillDispen, _payload$maxRefillDis, _payload$pendingRefil, _payload$prescription2, _payload$substitution, _payload$substitution2, _payload$substituteRe, _payload$broughtFromH, _payload$IVIngredient, _payload$createdby, _payload$updatedby, _payload$statushistor, _payload$statusperiod;
+  var _payload$patientid, _payload$encountertyp, _payload$encounterid, _payload$prescription, _payload$Prescription, _payload$name$drugTyp, _payload$name, _payload$presNature$v, _payload$presNature, _payload$presMode$val, _payload$presMode, _payload$priority$val, _payload$priority, _payload$status, _payload$statusreason, _payload$intent, _payload$orderPrivile, _payload$privilegeAle, _payload$workFlowStat, _payload$name$value, _payload$name2, _payload$formCode, _payload$DefaultRoute, _payload$DefaultRoute2, _payload$dosageTypeIn, _payload$unitValue$va, _payload$unitValue, _payload$drug_categor, _payload$drug_categor2, _payload$dispensing_p, _payload$dispensing_p2, _payload$IVDosageDura, _payload$IVDosageDura2, _payload$unitsTypes$v, _payload$unitsTypes, _payload$ivInfusionRa, _payload$ivInfusionRa2, _payload$doseOption$v, _payload$doseOption, _payload$occurStartDa, _payload$occurEndDate, _payload$totPresQtyUO, _payload$totPresQtyUO2, _payload$totDispQty, _payload$totDispQtyUO, _payload$totBilledQty, _payload$totBilledQty2, _payload$totReturnedQ, _payload$PRNYN, _payload$prnComment, _payload$direction, _payload$diagnosis, _payload$reasonCode, _payload$indication$v, _payload$indication, _payload$patientInstr, _payload$patientInstr2, _payload$patientInstr3, _payload$notes, _payload$parentPresId, _payload$presGroupRef, _payload$noofRefillsA, _payload$initialDispe, _payload$refillDispen, _payload$maxRefillDis, _payload$pendingRefil, _payload$prescription2, _payload$substitution, _payload$substitution2, _payload$substituteRe, _payload$broughtFromH, _payload$IVIngredient, _payload$createdby, _payload$updatedby, _payload$statushistor, _payload$statusperiod;
 
   var filter = {};
 
@@ -25482,7 +25686,8 @@ var generateJSON$6 = function generateJSON(payload, orgId) {
       "workFlowStatus": (_payload$workFlowStat = payload.workFlowStatus) !== null && _payload$workFlowStat !== void 0 ? _payload$workFlowStat : "",
       "drugCode": (_payload$name$value = (_payload$name2 = payload.name) === null || _payload$name2 === void 0 ? void 0 : _payload$name2.value) !== null && _payload$name$value !== void 0 ? _payload$name$value : "",
       "formCode": (_payload$formCode = payload.formCode) !== null && _payload$formCode !== void 0 ? _payload$formCode : "",
-      "routeCode": (_payload$routeCode$va = (_payload$routeCode = payload.routeCode) === null || _payload$routeCode === void 0 ? void 0 : _payload$routeCode.value) !== null && _payload$routeCode$va !== void 0 ? _payload$routeCode$va : "",
+      // "routeCode": payload.routeCode?.value ?? "",
+      "routeCode": (_payload$DefaultRoute = payload === null || payload === void 0 ? void 0 : (_payload$DefaultRoute2 = payload.DefaultRouteCode) === null || _payload$DefaultRoute2 === void 0 ? void 0 : _payload$DefaultRoute2.value) !== null && _payload$DefaultRoute !== void 0 ? _payload$DefaultRoute : "",
       "dosageTypeIndicator": (_payload$dosageTypeIn = payload.dosageTypeIndicator) !== null && _payload$dosageTypeIn !== void 0 ? _payload$dosageTypeIn : "",
       "dosageValue": payload.doseMeasurementValue ? parseInt(payload.doseMeasurementValue) : 0,
       "dosageUOM": (_payload$unitValue$va = (_payload$unitValue = payload.unitValue) === null || _payload$unitValue === void 0 ? void 0 : _payload$unitValue.value) !== null && _payload$unitValue$va !== void 0 ? _payload$unitValue$va : "",
@@ -29084,6 +29289,7 @@ var generateJSON$3 = function generateJSON(dataList) {
   var payload = dataList.map(function (data) {
     var _data$orderCatalog, _data$occuranceStartD, _data$occuranceEndDat, _data$orderQty, _data$status, _data$reasonCode, _data$indications, _data$notes, _data$accessionNum, _data$attribute$view, _data$attribute, _data$attribute$bedSi, _data$attribute2, _data$attribute$contr, _data$attribute3, _data$statusreason;
 
+    console.log("myJSonLab", data);
     var extraJson = {};
     var filter = {};
 
@@ -29313,7 +29519,7 @@ var queries$6 = {
       db_name: dbName,
       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 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}`,
+      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)}))},{orderCatalog:document(CA_OrderLine.orderCatalog).shortdesc},{orderCatalogId:document(CA_OrderLine.orderCatalog)._id})" // 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`,
@@ -29465,7 +29671,8 @@ var generateResJson$3 = function generateResJson(dataList, arr) {
       startDate: (_utcTOLocal5 = utcTOLocal$1(val === null || val === void 0 ? void 0 : val.orderDateTime, "YYYY-MM-DD,hh:mm A")) !== null && _utcTOLocal5 !== void 0 ? _utcTOLocal5 : "",
       orderCatalog: {
         label: val === null || val === void 0 ? void 0 : val.orderCatalog,
-        value: val === null || val === void 0 ? void 0 : val.orderCatalog
+        value: val === null || val === void 0 ? void 0 : val.orderCatalog,
+        _id: val === null || val === void 0 ? void 0 : val.orderCatalogId
       },
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
@@ -30033,7 +30240,8 @@ var GET_ORDERCATALOG = createAsyncThunk("LabOrderApiSlice/get_ordercatalog", /*#
             data.result.map(function (val, i) {
               returnData.push({
                 value: val === null || val === void 0 ? void 0 : val.ordercatalog,
-                label: val === null || val === void 0 ? void 0 : val.longdesc
+                label: val === null || val === void 0 ? void 0 : val.longdesc,
+                _id: val === null || val === void 0 ? void 0 : val._id
               });
             });
           }
@@ -31986,7 +32194,27 @@ var queries$5 = {
     return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"PH_OrderLine\",\n        \"filter\": \"PH_OrderLine._id=='").concat(id, "'\"\n    }");
   },
   statusMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='MEDRECORDSTATUS'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n    }"),
-  workFlowStatus: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='MEDWFSTATUS'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }")
+  workFlowStatus: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='MEDWFSTATUS'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
+  PharmacyFramework_Patientbanner: function PharmacyFramework_Patientbanner(id) {
+    return {
+      db_name: dbName,
+      entity: "Patient",
+      filter: "Patient._id=='".concat(id, "' && Patient.activestatus==true"),
+      return_fields: "merge({_id:Patient._id},{birthDate:Patient.birthDate},{id:Patient.id},{_key:Patient._key},{photo:document(Patient.photo)},{name:(for doc in HumanNameMaster filter doc._id in Patient.name return merge(doc,{use:(document(doc.use)),prefix:(document(doc.prefix)),suffix:(document(doc.suffix))}))},{age:Patient.age},{bloodGroup:document(Patient.bloodGroup)},{telecom:(for doc in ContactPointMaster filter doc._id in Patient.telecom return merge(doc,{system:(document(doc.system)),use:(document(doc.use)),valueprefix:(document(doc.valueprefix)),rank:(document(doc.rank))}))},{alias:Patient.alias},{gender:document(Patient.gender)},{PatientType:document(Patient.patientTypecode).display},{EmergencyDetails:(FOR RelatedPerson IN RelatedPerson FILTER RelatedPerson.PatientID==[ to_string(Patient.id) ] && RelatedPerson.activestatus==true Return merge(keep(RelatedPerson,'_id','_key'),{name:first(document(RelatedPerson.name)[*].text)},{relationship:document(RelatedPerson.relationship).display},{telecom:document(RelatedPerson.telecom)[*].value}))})"
+    };
+  },
+  PharmacyFramework_Encounterbanner: function PharmacyFramework_Encounterbanner(patientId, facilityId) {
+    return {
+      db_name: dbName,
+      entity: "Organization,Encounter",
+      filter: {
+        Organization: "Organization._id == '".concat(facilityId, "'"),
+        Encounter: "Encounter.patient_id == ".concat(patientId, " && Encounter.Organization_id == Organization.id && Encounter.activestatus == true")
+      },
+      return_fields: "merge({_id:Encounter._id},{id:Encounter.id},{_key:Encounter._key},{encounterdate:Encounter.encounterdate},{encounter_no:Encounter.encounter_no},{type_id:Encounter.type},{type:DOCUMENT(Encounter.type)[0].code},{visit_type:Encounter.visit_type},{location:first(document((Encounter.location)[*].location_id)[*].shortdesc)},{Practitioner_id:(for part in Encounter.participant for practId in Practitioner filter practId.id == part.Practitioner_id return merge(keep(practId,'_id'),{position:document(document(practId.position).coding)[*].display},{telecom:(for tel in ContactPointMaster filter tel._id in practId.telecom return merge(tel,{system:document(tel.system)}))},{name:(for doc in HumanNameMaster filter doc._id in practId.name return merge(doc,{use:(document(document(doc.use).coding)),prefix:(document(document(doc.prefix).coding)),suffix:(document(document(doc.suffix).coding))}))}) )},{PractitionerRole_id:(for part in Encounter.participant for practRole in PractitionerRole filter practRole.id == part.PractitionerRole_id return document(document(practRole.role).coding))},{speciality:document(first(document(Encounter.practitioner_details[*].speciality)).coding)[*].display}, {Location:(for loc in LocationMaster filter first(Encounter.location[*].location_id) == loc._id return merge(loc,{locationType:merge(document(loc.locationType),{coding:document(document(loc.locationType).coding)})},{locationRoletype:document(loc.locationRoletype)}))})",
+      sort: "Encounter.encounterdate desc"
+    };
+  }
 }; // [
 //     {
 //       "db_name": "primarycare",
@@ -32109,7 +32337,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, _val$DrugType3, _val$DrugType4, _val$drugroutegenid, _val$LongDesc;
+            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2, _val$DrugType3, _val$DrugType4, _val$drugroutegenid, _val$LongDesc, _val$DrugCategory, _val$DefaultRouteCode;
 
             var json = {
               value: val === null || val === void 0 ? void 0 : val._id,
@@ -32124,7 +32352,9 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
               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 : "",
               LongDesc_: (_val$LongDesc = val === null || val === void 0 ? void 0 : val.LongDesc) !== null && _val$LongDesc !== void 0 ? _val$LongDesc : "",
-              DrugCode_: val === null || val === void 0 ? void 0 : val.DrugCode // formValue
+              DrugCode_: val === null || val === void 0 ? void 0 : val.DrugCode,
+              DrugCategory: (_val$DrugCategory = val === null || val === void 0 ? void 0 : val.DrugCategory) !== null && _val$DrugCategory !== void 0 ? _val$DrugCategory : "",
+              DefaultRouteCode: (_val$DefaultRouteCode = val === null || val === void 0 ? void 0 : val.DefaultRouteCode) !== null && _val$DefaultRouteCode !== void 0 ? _val$DefaultRouteCode : "" // formValue
 
             };
             arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
@@ -34155,14 +34385,14 @@ var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication",
           list = payload; // const states = getState();
 
           body = [{
-            "db_name": dbName,
-            "entity": "PH_OrderLine",
-            "filter": "PH_OrderLine._id=='".concat(list.id, "'"),
-            "doc": {
-              "status": (_list$status = list.status) === null || _list$status === void 0 ? void 0 : _list$status.value,
-              "statusreason": list.statusReason,
-              "statusperiod": list.statusperiod,
-              "statushistory": list.statushistory
+            db_name: dbName,
+            entity: "PH_OrderLine",
+            filter: "PH_OrderLine._id=='".concat(list.id, "'"),
+            doc: {
+              status: (_list$status = list.status) === null || _list$status === void 0 ? void 0 : _list$status.value,
+              statusreason: list.statusReason,
+              statusperiod: list.statusperiod,
+              statushistory: list.statushistory
             }
           }]; // if (list.status?.label === "Complete") {
           //     let flowStatusList = [];
@@ -34290,15 +34520,15 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
           });
           arr = medication.map(function (data) {
             return {
-              "db_name": dbName,
-              "entity": "PH_OrderLine",
-              "filter": "PH_OrderLine._id=='".concat(data._id, "'"),
-              "doc": {
-                "status": data.status,
-                "statusreason": data.statusreason,
-                "statusperiod": data.statusperiod,
-                "statushistory": data.statushistory,
-                "workFlowStatus": data.workFlowStatus
+              db_name: dbName,
+              entity: "PH_OrderLine",
+              filter: "PH_OrderLine._id=='".concat(data._id, "'"),
+              doc: {
+                status: data.status,
+                statusreason: data.statusreason,
+                statusperiod: data.statusperiod,
+                statushistory: data.statushistory,
+                workFlowStatus: data.workFlowStatus
               }
             };
           });
@@ -34336,6 +34566,90 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
     }
   }, _callee6, null, [[2, 20]]);
 })));
+var PATIENT_BANNER = createAsyncThunk("medicationsSlice/patient_banner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+  var payload,
+      _ref14,
+      rejectWithValue,
+      id,
+      data,
+      _args7 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee7$(_context7) {
+    while (1) {
+      switch (_context7.prev = _context7.next) {
+        case 0:
+          payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+          _ref14 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref14.rejectWithValue;
+          _context7.prev = 2;
+          id = payload.id;
+          _context7.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(queries$5.PharmacyFramework_Patientbanner(id))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context7.sent;
+          return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data.result
+          }));
+
+        case 10:
+          _context7.prev = 10;
+          _context7.t0 = _context7["catch"](2);
+          return _context7.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context7.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context7.stop();
+      }
+    }
+  }, _callee7, null, [[2, 10]]);
+})));
+var ENCOUNTER_BANNER = createAsyncThunk("medicationsSlice/Encounterbanner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+  var payload,
+      _ref16,
+      rejectWithValue,
+      getState,
+      patientId,
+      facilityId,
+      data,
+      _args8 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee8$(_context8) {
+    while (1) {
+      switch (_context8.prev = _context8.next) {
+        case 0:
+          payload = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
+          _ref16 = _args8.length > 1 ? _args8[1] : undefined, rejectWithValue = _ref16.rejectWithValue, getState = _ref16.getState;
+          _context8.prev = 2;
+          patientId = payload.patientId, facilityId = payload.facilityId;
+          _context8.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(queries$5.PharmacyFramework_Encounterbanner(patientId, facilityId))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context8.sent;
+          return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data.result
+          }));
+
+        case 10:
+          _context8.prev = 10;
+          _context8.t0 = _context8["catch"](2);
+          return _context8.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context8.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context8.stop();
+      }
+    }
+  }, _callee8, null, [[2, 10]]);
+})));
 var medicationsSlice = createSlice({
   name: "medicationsSlice",
   initialState: {
@@ -34344,68 +34658,90 @@ var medicationsSlice = createSlice({
     update_workflow_status: _objectSpread2({}, defaultState.Info),
     medication_list: _objectSpread2({}, defaultState.List),
     alert_codes: _objectSpread2({}, defaultState.list),
-    drug_codes: _objectSpread2({}, defaultState.list)
+    drug_codes: _objectSpread2({}, defaultState.list),
+    patientBanner: _objectSpread2({}, defaultState.List),
+    Encounterbanner: _objectSpread2({}, defaultState.List)
   },
-  extraReducers: (_extraReducers$g = {}, _defineProperty(_extraReducers$g, ALERT_CODES.fulfilled, function (state, action) {
+  extraReducers: (_extraReducers$g = {}, _defineProperty(_extraReducers$g, PATIENT_BANNER.fulfilled, function (state, action) {
     var _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 : {};
+    state.patientBanner = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+  }), _defineProperty(_extraReducers$g, PATIENT_BANNER.pending, function (state, action) {
+    state.patientBanner.loading = true;
+  }), _defineProperty(_extraReducers$g, PATIENT_BANNER.rejected, function (state, action) {
+    var _action$payload2;
+
+    state.patientBanner = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+  }), _defineProperty(_extraReducers$g, ALERT_CODES.fulfilled, function (state, action) {
+    var _action$payload3;
+
+    state.alert_codes.loading = false, state.alert_codes.error = false, state.alert_codes = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
   }), _defineProperty(_extraReducers$g, ALERT_CODES.pending, function (state, action) {
     state.alert_codes.error = false, state.alert_codes.loading = true;
   }), _defineProperty(_extraReducers$g, ALERT_CODES.rejected, function (state, action) {
-    var _action$payload2;
+    var _action$payload4;
 
-    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 : {};
+    state.alert_codes.loading = false, state.alert_codes.error = true, state.alert_codes = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
   }), _defineProperty(_extraReducers$g, DRUG_CODES.fulfilled, function (state, action) {
-    var _action$payload3;
+    var _action$payload5;
 
-    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 : {};
+    state.drug_codes.loading = false, state.drug_codes.error = false, state.drug_codes = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
   }), _defineProperty(_extraReducers$g, DRUG_CODES.pending, function (state, action) {
     state.drug_codes.error = false, state.drug_codes.loading = true;
   }), _defineProperty(_extraReducers$g, DRUG_CODES.rejected, function (state, action) {
-    var _action$payload4;
+    var _action$payload6;
 
-    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 : {};
+    state.drug_codes.loading = false, state.drug_codes.error = true, state.drug_codes = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
   }), _defineProperty(_extraReducers$g, SAVE_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload5;
+    var _action$payload7;
 
-    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 : {};
+    state.save_medication.loading = false, state.save_medication.error = false, state.save_medication = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
   }), _defineProperty(_extraReducers$g, SAVE_MEDICATIONS.pending, function (state, action) {
     state.save_medication.error = false, state.save_medication.loading = true;
   }), _defineProperty(_extraReducers$g, SAVE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload6;
+    var _action$payload8;
 
-    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 : {};
+    state.save_medication.loading = false, state.save_medication.error = true, state.save_medication = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
   }), _defineProperty(_extraReducers$g, UPDATE_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload7;
+    var _action$payload9;
 
-    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 : {};
+    state.update_medication.loading = false, state.update_medication.error = false, state.update_medication = (_action$payload9 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload9 !== void 0 ? _action$payload9 : {};
   }), _defineProperty(_extraReducers$g, UPDATE_MEDICATIONS.pending, function (state, action) {
     state.update_medication.error = false, state.update_medication.loading = true;
   }), _defineProperty(_extraReducers$g, UPDATE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload8;
+    var _action$payload10;
 
-    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 : {};
+    state.update_medication.loading = false, state.update_medication.error = true, state.update_medication = (_action$payload10 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload10 !== void 0 ? _action$payload10 : {};
   }), _defineProperty(_extraReducers$g, GET_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload9;
+    var _action$payload11;
 
-    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 : {};
+    state.medication_list.loading = false, state.medication_list.error = false, state.medication_list = (_action$payload11 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload11 !== void 0 ? _action$payload11 : {};
   }), _defineProperty(_extraReducers$g, GET_MEDICATIONS.pending, function (state, action) {
     state.medication_list.error = false, state.medication_list.loading = true;
   }), _defineProperty(_extraReducers$g, GET_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload10;
+    var _action$payload12;
 
-    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 : {};
+    state.medication_list.loading = false, state.medication_list.error = true, state.medication_list = (_action$payload12 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload12 !== void 0 ? _action$payload12 : {};
   }), _defineProperty(_extraReducers$g, UPDATE_ALL_WORKFLOW_STATUS.fulfilled, function (state, action) {
-    var _action$payload11;
+    var _action$payload13;
 
-    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 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = false, state.update_workflow_status = (_action$payload13 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload13 !== void 0 ? _action$payload13 : {};
   }), _defineProperty(_extraReducers$g, UPDATE_ALL_WORKFLOW_STATUS.pending, function (state, action) {
     state.update_workflow_status.error = false, state.update_workflow_status.loading = true;
   }), _defineProperty(_extraReducers$g, UPDATE_ALL_WORKFLOW_STATUS.rejected, function (state, action) {
-    var _action$payload12;
+    var _action$payload14;
 
-    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 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = true, state.update_workflow_status = (_action$payload14 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload14 !== void 0 ? _action$payload14 : {};
+  }), _defineProperty(_extraReducers$g, ENCOUNTER_BANNER.fulfilled, function (state, action) {
+    var _action$payload15;
+
+    state.Encounterbanner = (_action$payload15 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload15 !== void 0 ? _action$payload15 : {};
+  }), _defineProperty(_extraReducers$g, ENCOUNTER_BANNER.pending, function (state, action) {
+    state.Encounterbanner.loading = true;
+  }), _defineProperty(_extraReducers$g, ENCOUNTER_BANNER.rejected, function (state, action) {
+    var _action$payload16;
+
+    state.Encounterbanner = (_action$payload16 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload16 !== void 0 ? _action$payload16 : {};
   }), _extraReducers$g)
 });
 var medicationsActions = {
@@ -34414,7 +34750,9 @@ var medicationsActions = {
   UPDATE_MEDICATIONS: UPDATE_MEDICATIONS,
   UPDATE_ALL_WORKFLOW_STATUS: UPDATE_ALL_WORKFLOW_STATUS,
   ALERT_CODES: ALERT_CODES,
-  DRUG_CODES: DRUG_CODES
+  DRUG_CODES: DRUG_CODES,
+  PATIENT_BANNER: PATIENT_BANNER,
+  ENCOUNTER_BANNER: ENCOUNTER_BANNER
 };
 var medicationsSlice$1 = medicationsSlice.reducer;
 
@@ -34449,7 +34787,7 @@ var queries$4 = {
       db_name: dbName,
       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 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)}))})"
+      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)}))},{orderCatalog:document(CA_OrderLine.orderCatalog).shortdesc},{orderCatalogId:document(CA_OrderLine.orderCatalog)._id})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -34813,7 +35151,8 @@ var generateResJson$2 = function generateResJson(dataList, arr) {
       startDate: (_utcTOLocal5 = utcTOLocal$1(val === null || val === void 0 ? void 0 : val.orderDateTime, "YYYY-MM-DD,hh:mm A")) !== null && _utcTOLocal5 !== void 0 ? _utcTOLocal5 : "",
       orderCatalog: {
         label: val === null || val === void 0 ? void 0 : val.orderCatalog,
-        value: val === null || val === void 0 ? void 0 : val.orderCatalog
+        value: val === null || val === void 0 ? void 0 : val.orderCatalog,
+        _id: val === null || val === void 0 ? void 0 : val.orderCatalogId
       },
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
@@ -35285,7 +35624,8 @@ var TREATMENT_PROCEDURE_GETCATEGORY = createAsyncThunk("TreatmentSlice/getorderc
 
             arr.push({
               value: val === null || val === void 0 ? void 0 : val._id,
-              label: (_val$shortdesc = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc !== void 0 ? _val$shortdesc : ""
+              label: (_val$shortdesc = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc !== void 0 ? _val$shortdesc : "",
+              _id: val === null || val === void 0 ? void 0 : val._id
             });
           });
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -36379,7 +36719,7 @@ var queries$3 = (_queries = {
       db_name: dbName,
       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 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)}))})"
+      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)}))},{orderCatalog:document(CA_OrderLine.orderCatalog).shortdesc},{orderCatalogId:document(CA_OrderLine.orderCatalog)._id})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -36745,7 +37085,8 @@ var generateResJson$1 = function generateResJson(dataList, arr) {
       startDate: (_utcTOLocal5 = utcTOLocal$1(val === null || val === void 0 ? void 0 : val.orderDateTime, "YYYY-MM-DD,hh:mm A")) !== null && _utcTOLocal5 !== void 0 ? _utcTOLocal5 : "",
       orderCatalog: {
         label: val === null || val === void 0 ? void 0 : val.orderCatalog,
-        value: val === null || val === void 0 ? void 0 : val.orderCatalog
+        value: val === null || val === void 0 ? void 0 : val.orderCatalog,
+        _id: val === null || val === void 0 ? void 0 : val.orderCatalogId
       },
       qty: JSON.stringify(val === null || val === void 0 ? void 0 : val.orderQty),
       requestorDetails: {
@@ -37268,7 +37609,8 @@ var RAD_GETCATEGORY = createAsyncThunk("RadiologySlice/getordercategory", /*#__P
 
             arr.push({
               value: val === null || val === void 0 ? void 0 : val._id,
-              label: (_val$shortdesc = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc !== void 0 ? _val$shortdesc : ""
+              label: (_val$shortdesc = val === null || val === void 0 ? void 0 : val.shortdesc) !== null && _val$shortdesc !== void 0 ? _val$shortdesc : "",
+              _id: val === null || val === void 0 ? void 0 : val._id
             });
           });
           return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primarycare-binder",
-  "version": "1.1.116",
+  "version": "1.1.120",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",