primarycare-binder 1.1.121 → 1.1.124

package/dist/index.cjs.js

@@ -8130,7 +8130,7 @@ var queries$b = {
       return "'".concat(name, "' IN Organization.OrgType");
     },
     // "filter": "'Hospital' IN Organization.OrgType",
-    returnFields: "{OrgID:Organization.id,name:Organization.name}"
+    returnFields: "{OrgID:Organization.id,name:Organization.name, _id:Organization._id }"
   },
   codablemasterSpeciality: {
     query: function query(id) {
@@ -8153,15 +8153,16 @@ var queries$b = {
     returnFields: "distinct {practitioner_type:contains(Practitioner.practitioner_type,'CodeableConceptMaster')?document(document(Practitioner.practitioner_type).coding):document(Practitioner.practitioner_type)}"
   },
   codablemasterPractitionerName: {
-    query: function query(specialityID, practitionerType) {
-      return "(document(Practitioner.practitioner_role)[*].SpecialtyID any == '".concat(specialityID, "' || first(document(document(Practitioner.practitioner_role)[*].SpecialtyID)[*].coding) any == '").concat(specialityID, "' ) && (document(Practitioner.practitioner_type).coding any=='").concat(practitionerType, "' || Practitioner.practitioner_type=='").concat(practitionerType, "') && Practitioner.activestatus==true && Practitioner.active == true");
+    query: function query(specialityID, practitionerType, facilityId) {
+      return "(document(Practitioner.practitioner_role)[*].SpecialtyID any == '".concat(specialityID, "' || first(document(document(Practitioner.practitioner_role)[*].SpecialtyID)[*].coding) any == '").concat(specialityID, "' ) && (document(Practitioner.practitioner_type).coding any=='").concat(practitionerType, "' || Practitioner.practitioner_type=='").concat(practitionerType, "') && document(Practitioner.practitioner_role)[*].OrgID any=='").concat(facilityId, "' && Practitioner.activestatus==true && Practitioner.active == true");
     },
     returnFields: "merge(Practitioner,{name:(for hm in HumanNameMaster filter hm._id in Practitioner.name return merge(hm,{use:(for cod in CodeableConceptMaster filter cod._id== hm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == hm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == hm.suffix return document(cod.coding))}))})"
   },
   codablemasterGetFinancial: {
     query: function query(patientId) {
-      return "Account.guarantor[0].patient_id==".concat(patientId);
+      return "document(Account.linkidenvalue).id == ".concat(patientId, " && Account.activestatus==true");
     },
+    //  `Account.guarantor[0].patient_id==${patientId}`,
     // "filter": "Account.patient_id==@patient_id",
     returnFields: "Account"
   },
@@ -8359,6 +8360,10 @@ var __update__ = "".concat(process.env.REACT_APP_BASE_URL_PROTOCAL, "://").conca
 var __readDocumentUrl__ = "".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/read_documents");
 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 __OrderlinewithQueue__ = "".concat(process.env.REACT_APP_NIFI_CLMM_API, "/api/v1/upsert/OrderlinewithQueue");
+var __GetOrderStartDate__ = "".concat(process.env.REACT_APP_CLMM_NIFI_API, "/api/ScheduleGeneration/GetOrderStartDate"); // export const __GetOrderStartDate__ = `https://apiclmm.dev.ainqaplatform.in/api/ScheduleGeneration/GetOrderStartDate`;
+
+var __Soft_Delete__ = "".concat(process.env.REACT_APP_SOFT_DELETE, "/api/soft_delete"); // export const __ruleBuilderUrl__ = `http://164.52.210.54:9090/multi/rule-validate`;
 
 var __seqNoGenerator__ = "".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/generate_sequence");
 var __insertRCMurl__ = "".concat(process.env.REACT_APP_BASE_URL_PROTOCAL, "://").concat(process.env.REACT_APP_AUTH_URL_HOST, "/api/v1/insertCAOrderInRCMPatTrx");
@@ -8420,7 +8425,7 @@ var urls = (_urls = {
   get_hospitals_locality: "/api/v1/getHospitalBasedonLocality"
 }, _defineProperty(_urls, "get_cities", "/api/v1/getCityFromHospital"), _defineProperty(_urls, "get_symptoms", "/api/v1/getSymptoms"), _defineProperty(_urls, "get_speciality", "/api/v1/getSpeciality"), _defineProperty(_urls, "upsert_service", "/api/v1/upsertService"), _defineProperty(_urls, "read_service", "/api/v1/readService"), _defineProperty(_urls, "delete_service", "/api/v1/deleteService"), _defineProperty(_urls, "upsert_slot", "/api/v1/upsertSlot"), _defineProperty(_urls, "read_slot", "api/v1/readSlot"), _defineProperty(_urls, "delete_slot", "api/v1/deleteSlot"), _defineProperty(_urls, "slot_availability", "api/v1/readAvailibalityChecking"), _defineProperty(_urls, "upsert_task", "api/v1/upsertTask"), _defineProperty(_urls, "read_task", "api/v1/readTask"), _defineProperty(_urls, "delete_task", "api/v1/deleteTask"), _defineProperty(_urls, "upsert_schedule", "api/v1/upsertSchedule"), _defineProperty(_urls, "read_schedule", "api/v1/readSchedule"), _defineProperty(_urls, "delete_schedule", "api/v1/deleteSchedule"), _defineProperty(_urls, "upsert_person", "api/v1/upsertPerson"), _defineProperty(_urls, "read_person", "api/v1/readPerson"), _defineProperty(_urls, "delete_person", "api/v1/deletePerson"), _defineProperty(_urls, "upsert_practitioner_role", "api/v1/upsertPractitionerRole"), _defineProperty(_urls, "read_practitioner_role", "api/v1/readPractitionerRole"), _defineProperty(_urls, "delete_practitioner_role", "api/v1/deletePractitionerRole"), _defineProperty(_urls, "get_user_info", "api/v1/getUserInfo"), _defineProperty(_urls, "oraganization_registration", "api/v1/orgUserRegistration"), _defineProperty(_urls, "oraganization_siginIn", "".concat(__keyClockLogin__, "/api/v1/orgUserSignIn")), _defineProperty(_urls, "oraganization_registet_patient", "api/v1/upsert_document"), _urls);
 
-var makeName = function makeName() {
+var makeName$1 = function makeName() {
   var _prefix$, _prefix$$coding, _prefix$$coding$, _prefix$coding, _prefix$coding$, _prefix$2, _suffix$, _suffix$$coding, _suffix$$coding$, _suffix$coding, _suffix$coding$, _suffix$2;
 
   var nameObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -10983,8 +10988,8 @@ var PATIENT_CITY_READ = createAsyncThunk("patientReducer/readPatientCity", /*#__
             var _val$name, _val$name2, _val$_id7;
 
             arr4.push({
-              label: makeName((_val$name = val === null || val === void 0 ? void 0 : val.name) !== null && _val$name !== void 0 ? _val$name : {}),
-              value: makeName((_val$name2 = val === null || val === void 0 ? void 0 : val.name) !== null && _val$name2 !== void 0 ? _val$name2 : {}),
+              label: makeName$1((_val$name = val === null || val === void 0 ? void 0 : val.name) !== null && _val$name !== void 0 ? _val$name : {}),
+              value: makeName$1((_val$name2 = val === null || val === void 0 ? void 0 : val.name) !== null && _val$name2 !== void 0 ? _val$name2 : {}),
               _id: (_val$_id7 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id7 !== void 0 ? _val$_id7 : ""
             });
           });
@@ -11861,7 +11866,7 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
               info["hospitalName"] = ((_practData$28 = practData[0]) === null || _practData$28 === void 0 ? void 0 : (_practData$28$practit = _practData$28.practitioner_role) === null || _practData$28$practit === void 0 ? void 0 : (_practData$28$practit2 = _practData$28$practit[0]) === null || _practData$28$practit2 === void 0 ? void 0 : (_practData$28$practit3 = _practData$28$practit2.OrgID) === null || _practData$28$practit3 === void 0 ? void 0 : _practData$28$practit3.name) || "";
               info["hospitalLocation"] = ((_practData$29 = practData[0]) === null || _practData$29 === void 0 ? void 0 : (_practData$29$address = _practData$29.address) === null || _practData$29$address === void 0 ? void 0 : (_practData$29$address2 = _practData$29$address[0]) === null || _practData$29$address2 === void 0 ? void 0 : _practData$29$address2.line) || "";
               nameObj = ((_practData$30 = practData[0]) === null || _practData$30 === void 0 ? void 0 : (_practData$30$name = _practData$30.name) === null || _practData$30$name === void 0 ? void 0 : _practData$30$name[0]) || {};
-              info["name"] = makeName(nameObj);
+              info["name"] = makeName$1(nameObj);
               info["kms"] = kms;
               info["orgType"] = (_practData$31 = practData[0]) === null || _practData$31 === void 0 ? void 0 : (_practData$31$practit = _practData$31.practitioner_role) === null || _practData$31$practit === void 0 ? void 0 : (_practData$31$practit2 = _practData$31$practit[0]) === null || _practData$31$practit2 === void 0 ? void 0 : (_practData$31$practit3 = _practData$31$practit2.OrgID) === null || _practData$31$practit3 === void 0 ? void 0 : (_practData$31$practit4 = _practData$31$practit3.OrgType) === null || _practData$31$practit4 === void 0 ? void 0 : _practData$31$practit4[0];
               info["org_Id"] = (_practData$0$practiti = (_practData$32 = practData[0]) === null || _practData$32 === void 0 ? void 0 : (_practData$32$practit = _practData$32.practitioner_role) === null || _practData$32$practit === void 0 ? void 0 : (_practData$32$practit2 = _practData$32$practit[0]) === null || _practData$32$practit2 === void 0 ? void 0 : (_practData$32$practit3 = _practData$32$practit2.OrgID) === null || _practData$32$practit3 === void 0 ? void 0 : _practData$32$practit3._id) !== null && _practData$0$practiti !== void 0 ? _practData$0$practiti : (_practData$33 = practData[0]) === null || _practData$33 === void 0 ? void 0 : (_practData$33$practit = _practData$33.practitioner_role) === null || _practData$33$practit === void 0 ? void 0 : (_practData$33$practit2 = _practData$33$practit[0]) === null || _practData$33$practit2 === void 0 ? void 0 : _practData$33$practit2.EntityName;
@@ -14922,7 +14927,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital8 = restData.hospital) === null || _restData$hospital8 === void 0 ? void 0 : _restData$hospital8.name) || "";
                     info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital9 = restData.hospital) === null || _restData$hospital9 === void 0 ? void 0 : (_restData$hospital9$a = _restData$hospital9.address) === null || _restData$hospital9$a === void 0 ? void 0 : (_restData$hospital9$a2 = _restData$hospital9$a.city) === null || _restData$hospital9$a2 === void 0 ? void 0 : _restData$hospital9$a2.geogLevelName) || "";
                     var nameObj = (restData === null || restData === void 0 ? void 0 : (_restData$name = restData.name) === null || _restData$name === void 0 ? void 0 : _restData$name[0]) || {};
-                    info["name"] = makeName(nameObj);
+                    info["name"] = makeName$1(nameObj);
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$photo = restData.photo) === null || _restData$photo === void 0 ? void 0 : (_restData$photo$ = _restData$photo[0]) === null || _restData$photo$ === void 0 ? void 0 : _restData$photo$.fileid);
                     info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address4 = restData.address) === null || _restData$address4 === void 0 ? void 0 : (_restData$address4$ = _restData$address4[0]) === null || _restData$address4$ === void 0 ? void 0 : _restData$address4$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
@@ -16026,7 +16031,7 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
               var _spec$name, _spec$SPECIALTY, _spec$SPECIALTY$, _spec$SPECIALTY$$codi, _spec$SPECIALTY$$codi2;
 
               returnData.push({
-                label: makeName((_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : _spec$name[0]),
+                label: makeName$1((_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : _spec$name[0]),
                 value: spec.id,
                 type: "Doctor",
                 speciality: spec === null || spec === void 0 ? void 0 : (_spec$SPECIALTY = spec.SPECIALTY) === null || _spec$SPECIALTY === void 0 ? void 0 : (_spec$SPECIALTY$ = _spec$SPECIALTY[0]) === null || _spec$SPECIALTY$ === void 0 ? void 0 : (_spec$SPECIALTY$$codi = _spec$SPECIALTY$.coding) === null || _spec$SPECIALTY$$codi === void 0 ? void 0 : (_spec$SPECIALTY$$codi2 = _spec$SPECIALTY$$codi[0]) === null || _spec$SPECIALTY$$codi2 === void 0 ? void 0 : _spec$SPECIALTY$$codi2.display
@@ -17727,7 +17732,7 @@ var READ_PERSON = createAsyncThunk("personApiSlice/readPerson", /*#__PURE__*/_as
             id: (data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$ = _data$[0]) === null || _data$$ === void 0 ? void 0 : _data$$.Id) || 0,
             birthDay: (data === null || data === void 0 ? void 0 : (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$ = _data$2[0]) === null || _data$2$ === void 0 ? void 0 : _data$2$.birthDay) || "",
             gender: (data === null || data === void 0 ? void 0 : (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$ = _data$3[0]) === null || _data$3$ === void 0 ? void 0 : _data$3$.gender) || "",
-            name: makeName(data === null || data === void 0 ? void 0 : (_data$4 = data[0]) === null || _data$4 === void 0 ? void 0 : (_data$4$ = _data$4[0]) === null || _data$4$ === void 0 ? void 0 : (_data$4$$names = _data$4$.names) === null || _data$4$$names === void 0 ? void 0 : _data$4$$names[0]) || "",
+            name: makeName$1(data === null || data === void 0 ? void 0 : (_data$4 = data[0]) === null || _data$4 === void 0 ? void 0 : (_data$4$ = _data$4[0]) === null || _data$4$ === void 0 ? void 0 : (_data$4$$names = _data$4$.names) === null || _data$4$$names === void 0 ? void 0 : _data$4$$names[0]) || "",
             pid: (data === null || data === void 0 ? void 0 : (_data$5 = data[0]) === null || _data$5 === void 0 ? void 0 : (_data$5$ = _data$5[0]) === null || _data$5$ === void 0 ? void 0 : (_data$5$$Patientname = _data$5$.Patientname) === null || _data$5$$Patientname === void 0 ? void 0 : (_data$5$$Patientname$ = _data$5$$Patientname[0]) === null || _data$5$$Patientname$ === void 0 ? void 0 : _data$5$$Patientname$._id) || "",
             mrn: (data === null || data === void 0 ? void 0 : (_data$6 = data[0]) === null || _data$6 === void 0 ? void 0 : (_data$6$ = _data$6[0]) === null || _data$6$ === void 0 ? void 0 : (_data$6$$Patientname = _data$6$.Patientname) === null || _data$6$$Patientname === void 0 ? void 0 : (_data$6$$Patientname$ = _data$6$$Patientname[0]) === null || _data$6$$Patientname$ === void 0 ? void 0 : _data$6$$Patientname$.alias) || "",
             username: phone,
@@ -18895,13 +18900,26 @@ var ORGANIZATION_FINANCIAL_REGISTRATION = createAsyncThunk("OrganizationRegister
         case 7:
           Del_data = _context5.sent;
           body = payloaddata.map(function (val, i) {
-            return {
-              db_name: dbName,
-              entity: "Account",
-              is_metadata: true,
-              metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
-              doc: val
-            };
+            if (val === null || val === void 0 ? void 0 : val._key) {
+              return {
+                db_name: dbName,
+                entity: "Account",
+                is_metadata: true,
+                metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
+                doc: val,
+                filter: {
+                  _key: val === null || val === void 0 ? void 0 : val._key
+                }
+              };
+            } else {
+              return {
+                db_name: dbName,
+                entity: "Account",
+                is_metadata: true,
+                metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
+                doc: val
+              };
+            }
           });
           _context5.next = 11;
           return fetchData$3({
@@ -18928,15 +18946,13 @@ var ORGANIZATION_FINANCIAL_REGISTRATION = createAsyncThunk("OrganizationRegister
     }
   }, _callee5, null, [[2, 15]]);
 })));
-var GET_FACILITY_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfacility", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+var GET_PATIENT__ID_BY_ID = createAsyncThunk("OrganizationRegisterPatientApiSlice/getPatient_id", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
   var payload,
       _ref12,
       rejectWithValue,
-      _payload$type,
-      type,
+      patient_id,
       body,
       data,
-      returnData,
       _args6 = arguments;
 
   return regeneratorRuntime.wrap(function _callee6$(_context6) {
@@ -18946,12 +18962,12 @@ var GET_FACILITY_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
           payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
           _ref12 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref12.rejectWithValue;
           _context6.prev = 2;
-          _payload$type = payload.type, type = _payload$type === void 0 ? "ORGTYPE" : _payload$type;
+          patient_id = payload.patient_id;
           body = {
-            db_name: dbName,
-            entity: "CodeableConceptMaster",
-            filter: queries$b["codablemasterType"].query(type),
-            return_fields: queries$b["codablemasterType"].returnFields
+            "db_name": dbName,
+            "entity": "Patient",
+            "filter": "Patient.id==".concat(patient_id, " && Patient.activestatus==true"),
+            "return_fields": "Patient"
           };
           _context6.next = 7;
           return fetchData$3({
@@ -18960,36 +18976,30 @@ var GET_FACILITY_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
 
         case 7:
           data = _context6.sent;
-          returnData = [];
-
-          if (Array.isArray(data.result)) {
-            returnData = data.result;
-          }
-
-          return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
-            data: returnData
+          return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data
           }));
 
-        case 13:
-          _context6.prev = 13;
+        case 11:
+          _context6.prev = 11;
           _context6.t0 = _context6["catch"](2);
           return _context6.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context6.t0.message
           })));
 
-        case 16:
+        case 14:
         case "end":
           return _context6.stop();
       }
     }
-  }, _callee6, null, [[2, 13]]);
+  }, _callee6, null, [[2, 11]]);
 })));
-var GET_FACILITY_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfacilitytype", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+var GET_FACILITY_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfacility", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
   var payload,
       _ref14,
       rejectWithValue,
-      _payload$name,
-      name,
+      _payload$type,
+      type,
       body,
       data,
       returnData,
@@ -19002,12 +19012,12 @@ var GET_FACILITY_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
           payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
           _ref14 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref14.rejectWithValue;
           _context7.prev = 2;
-          _payload$name = payload.name, name = _payload$name === void 0 ? "Hospital" : _payload$name;
+          _payload$type = payload.type, type = _payload$type === void 0 ? "ORGTYPE" : _payload$type;
           body = {
             db_name: dbName,
-            entity: "Organization",
-            filter: queries$b["codablemasterName"].query(name),
-            return_fields: queries$b["codablemasterName"].returnFields
+            entity: "CodeableConceptMaster",
+            filter: queries$b["codablemasterType"].query(type),
+            return_fields: queries$b["codablemasterType"].returnFields
           };
           _context7.next = 7;
           return fetchData$3({
@@ -19040,6 +19050,62 @@ var GET_FACILITY_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
     }
   }, _callee7, null, [[2, 13]]);
 })));
+var GET_FACILITY_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfacilitytype", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+  var payload,
+      _ref16,
+      rejectWithValue,
+      _payload$name,
+      name,
+      body,
+      data,
+      returnData,
+      _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;
+          _context8.prev = 2;
+          _payload$name = payload.name, name = _payload$name === void 0 ? "Hospital" : _payload$name;
+          body = {
+            db_name: dbName,
+            entity: "Organization",
+            filter: queries$b["codablemasterName"].query(name),
+            return_fields: queries$b["codablemasterName"].returnFields
+          };
+          _context8.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(body)
+          }, __readDocumentUrl__);
+
+        case 7:
+          data = _context8.sent;
+          returnData = [];
+
+          if (Array.isArray(data.result)) {
+            returnData = data.result;
+          }
+
+          return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: returnData
+          }));
+
+        case 13:
+          _context8.prev = 13;
+          _context8.t0 = _context8["catch"](2);
+          return _context8.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context8.t0.message
+          })));
+
+        case 16:
+        case "end":
+          return _context8.stop();
+      }
+    }
+  }, _callee8, null, [[2, 13]]);
+})));
 
 var constructPractitonerType = function constructPractitonerType(data) {
   debugger;
@@ -19087,74 +19153,15 @@ var constructPractitonerName = function constructPractitonerName(data) {
   return arr;
 };
 
-var GET_PRACTITIONER_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getPractitionerType", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+var GET_PRACTITIONER_TYPE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getPractitionerType", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
   var payload,
-      _ref16,
+      _ref18,
       rejectWithValue,
       _payload$OrgID,
       OrgID,
       body,
       data,
       returnData,
-      _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;
-          _context8.prev = 2;
-          _payload$OrgID = payload.OrgID, OrgID = _payload$OrgID === void 0 ? "" : _payload$OrgID;
-          body = {
-            db_name: dbName,
-            entity: "Practitioner",
-            filter: queries$b["codablemasterPractitionerType"].query(OrgID),
-            return_fields: queries$b["codablemasterPractitionerType"].returnFields
-          };
-          _context8.next = 7;
-          return fetchData$3({
-            body: JSON.stringify(body)
-          }, __readDocumentUrl__);
-
-        case 7:
-          data = _context8.sent;
-          debugger;
-          returnData = [];
-
-          if (Array.isArray(data.result)) {
-            returnData = constructPractitonerType(data.result);
-          }
-
-          return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
-            data: returnData
-          }));
-
-        case 14:
-          _context8.prev = 14;
-          _context8.t0 = _context8["catch"](2);
-          return _context8.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context8.t0.message
-          })));
-
-        case 17:
-        case "end":
-          return _context8.stop();
-      }
-    }
-  }, _callee8, null, [[2, 14]]);
-})));
-var GET_PRACTITIONER_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getPractitionerName", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
-  var payload,
-      _ref18,
-      rejectWithValue,
-      _payload$specialityID,
-      specialityID,
-      _payload$practitioner,
-      practitionerType,
-      body,
-      data,
-      returnData,
       _args9 = arguments;
 
   return regeneratorRuntime.wrap(function _callee9$(_context9) {
@@ -19164,12 +19171,12 @@ var GET_PRACTITIONER_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlic
           payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
           _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue;
           _context9.prev = 2;
-          _payload$specialityID = payload.specialityID, specialityID = _payload$specialityID === void 0 ? "" : _payload$specialityID, _payload$practitioner = payload.practitionerType, practitionerType = _payload$practitioner === void 0 ? "" : _payload$practitioner;
+          _payload$OrgID = payload.OrgID, OrgID = _payload$OrgID === void 0 ? "" : _payload$OrgID;
           body = {
             db_name: dbName,
             entity: "Practitioner",
-            filter: queries$b["codablemasterPractitionerName"].query(specialityID, practitionerType),
-            return_fields: queries$b["codablemasterPractitionerName"].returnFields
+            filter: queries$b["codablemasterPractitionerType"].query(OrgID),
+            return_fields: queries$b["codablemasterPractitionerType"].returnFields
           };
           _context9.next = 7;
           return fetchData$3({
@@ -19182,7 +19189,7 @@ var GET_PRACTITIONER_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlic
           returnData = [];
 
           if (Array.isArray(data.result)) {
-            returnData = constructPractitonerName(data.result);
+            returnData = constructPractitonerType(data.result);
           }
 
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -19203,12 +19210,16 @@ var GET_PRACTITIONER_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlic
     }
   }, _callee9, null, [[2, 14]]);
 })));
-var GET_PRACTITIONER = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitioner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+var GET_PRACTITIONER_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getPractitionerName", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
   var payload,
       _ref20,
       rejectWithValue,
-      _payload$OrgID2,
-      OrgID,
+      _payload$facilityId,
+      facilityId,
+      _payload$specialityID,
+      specialityID,
+      _payload$practitioner,
+      practitionerType,
       body,
       data,
       returnData,
@@ -19221,12 +19232,12 @@ var GET_PRACTITIONER = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
           payload = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
           _ref20 = _args10.length > 1 ? _args10[1] : undefined, rejectWithValue = _ref20.rejectWithValue;
           _context10.prev = 2;
-          _payload$OrgID2 = payload.OrgID, OrgID = _payload$OrgID2 === void 0 ? "" : _payload$OrgID2;
+          _payload$facilityId = payload.facilityId, facilityId = _payload$facilityId === void 0 ? "" : _payload$facilityId, _payload$specialityID = payload.specialityID, specialityID = _payload$specialityID === void 0 ? "" : _payload$specialityID, _payload$practitioner = payload.practitionerType, practitionerType = _payload$practitioner === void 0 ? "" : _payload$practitioner;
           body = {
             db_name: dbName,
-            entity: "Practitioner,PractitionerRole",
-            filter: queries$b["codablemasterPractitioner"].query(OrgID),
-            return_fields: queries$b["codablemasterPractitioner"].returnFields
+            entity: "Practitioner",
+            filter: queries$b["codablemasterPractitionerName"].query(specialityID, practitionerType, facilityId),
+            return_fields: queries$b["codablemasterPractitionerName"].returnFields
           };
           _context10.next = 7;
           return fetchData$3({
@@ -19235,35 +19246,36 @@ var GET_PRACTITIONER = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
 
         case 7:
           data = _context10.sent;
+          debugger;
           returnData = [];
 
           if (Array.isArray(data.result)) {
-            returnData = data.result;
+            returnData = constructPractitonerName(data.result);
           }
 
           return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
-        case 13:
-          _context10.prev = 13;
+        case 14:
+          _context10.prev = 14;
           _context10.t0 = _context10["catch"](2);
           return _context10.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context10.t0.message
           })));
 
-        case 16:
+        case 17:
         case "end":
           return _context10.stop();
       }
     }
-  }, _callee10, null, [[2, 13]]);
+  }, _callee10, null, [[2, 14]]);
 })));
-var GET_PRACTITIONERS = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitioners", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+var GET_PRACTITIONER = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitioner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
   var payload,
       _ref22,
       rejectWithValue,
-      _payload$OrgID3,
+      _payload$OrgID2,
       OrgID,
       body,
       data,
@@ -19277,12 +19289,12 @@ var GET_PRACTITIONERS = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
           payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
           _ref22 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref22.rejectWithValue;
           _context11.prev = 2;
-          _payload$OrgID3 = payload.OrgID, OrgID = _payload$OrgID3 === void 0 ? "" : _payload$OrgID3;
+          _payload$OrgID2 = payload.OrgID, OrgID = _payload$OrgID2 === void 0 ? "" : _payload$OrgID2;
           body = {
             db_name: dbName,
-            entity: "Practitioner",
-            filter: "document(Practitioner.practitioner_role)[*].SpecialtyID any == '" + OrgID + "'",
-            return_fields: "merge(Practitioner,{name:(let n = document(Practitioner.name)[0] return merge(n, { prefix: (for p in CodeableConceptMaster filter p._id == n.prefix return Document(p.coding)[0])[0], suffix: (for s in CodeableConceptMaster filter s._id == n.suffix return Document(s.coding)[0])[0] }))},{practitioner_role:(for PractitionerRole in PractitionerRole filter Practitioner.practitioner_role any == PractitionerRole._id return merge(PractitionerRole,{role:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == PractitionerRole.role return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))}, {SpecialtyID:(for CodeableConceptMaster in CodeableConceptMaster filter PractitionerRole.SpecialtyID == CodeableConceptMaster._id return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}) ) } ) )}, {practitioner_type:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == Practitioner.practitioner_type return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))})"
+            entity: "Practitioner,PractitionerRole",
+            filter: queries$b["codablemasterPractitioner"].query(OrgID),
+            return_fields: queries$b["codablemasterPractitioner"].returnFields
           };
           _context11.next = 7;
           return fetchData$3({
@@ -19315,11 +19327,11 @@ var GET_PRACTITIONERS = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
     }
   }, _callee11, null, [[2, 13]]);
 })));
-var GET_PRACTITIONER_ROLE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitionerRole", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
+var GET_PRACTITIONERS = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitioners", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
       _ref24,
       rejectWithValue,
-      _payload$OrgID4,
+      _payload$OrgID3,
       OrgID,
       body,
       data,
@@ -19333,12 +19345,12 @@ var GET_PRACTITIONER_ROLE = createAsyncThunk("OrganizationRegisterPatientApiSlic
           payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
           _ref24 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref24.rejectWithValue;
           _context12.prev = 2;
-          _payload$OrgID4 = payload.OrgID, OrgID = _payload$OrgID4 === void 0 ? "" : _payload$OrgID4;
+          _payload$OrgID3 = payload.OrgID, OrgID = _payload$OrgID3 === void 0 ? "" : _payload$OrgID3;
           body = {
             db_name: dbName,
-            entity: "Practitioner,PractitionerRole,CodeableConceptMaster",
-            filter: queries$b["codablemasterPractitionerRole"].query(OrgID),
-            return_fields: queries$b["codablemasterPractitionerRole"].returnFields
+            entity: "Practitioner",
+            filter: "document(Practitioner.practitioner_role)[*].SpecialtyID any == '" + OrgID + "'",
+            return_fields: "merge(Practitioner,{name:(let n = document(Practitioner.name)[0] return merge(n, { prefix: (for p in CodeableConceptMaster filter p._id == n.prefix return Document(p.coding)[0])[0], suffix: (for s in CodeableConceptMaster filter s._id == n.suffix return Document(s.coding)[0])[0] }))},{practitioner_role:(for PractitionerRole in PractitionerRole filter Practitioner.practitioner_role any == PractitionerRole._id return merge(PractitionerRole,{role:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == PractitionerRole.role return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))}, {SpecialtyID:(for CodeableConceptMaster in CodeableConceptMaster filter PractitionerRole.SpecialtyID == CodeableConceptMaster._id return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}) ) } ) )}, {practitioner_type:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == Practitioner.practitioner_type return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))})"
           };
           _context12.next = 7;
           return fetchData$3({
@@ -19371,18 +19383,15 @@ var GET_PRACTITIONER_ROLE = createAsyncThunk("OrganizationRegisterPatientApiSlic
     }
   }, _callee12, null, [[2, 13]]);
 })));
-var GET_SPECIALITY_DATA = createAsyncThunk("OrganizationRegisterPatientApiSlice/getspeciality", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
+var GET_PRACTITIONER_ROLE = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpractitionerRole", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
   var payload,
       _ref26,
       rejectWithValue,
-      _payload$id,
-      id,
+      _payload$OrgID4,
+      OrgID,
       body,
       data,
       returnData,
-      _data$result$0$specia,
-      _data$result,
-      _data$result$,
       _args13 = arguments;
 
   return regeneratorRuntime.wrap(function _callee13$(_context13) {
@@ -19392,12 +19401,12 @@ var GET_SPECIALITY_DATA = createAsyncThunk("OrganizationRegisterPatientApiSlice/
           payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
           _ref26 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
           _context13.prev = 2;
-          _payload$id = payload.id, id = _payload$id === void 0 ? "" : _payload$id;
+          _payload$OrgID4 = payload.OrgID, OrgID = _payload$OrgID4 === void 0 ? "" : _payload$OrgID4;
           body = {
             db_name: dbName,
-            entity: "Organization",
-            filter: "Organization.id==".concat(id, " && Organization.activestatus==true"),
-            return_fields: "{specialty:DOCUMENT(Organization.specialtyDetails[*].specialty)}"
+            entity: "Practitioner,PractitionerRole,CodeableConceptMaster",
+            filter: queries$b["codablemasterPractitionerRole"].query(OrgID),
+            return_fields: queries$b["codablemasterPractitionerRole"].returnFields
           };
           _context13.next = 7;
           return fetchData$3({
@@ -19409,7 +19418,7 @@ var GET_SPECIALITY_DATA = createAsyncThunk("OrganizationRegisterPatientApiSlice/
           returnData = [];
 
           if (Array.isArray(data.result)) {
-            returnData = (_data$result$0$specia = (_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$.specialty) !== null && _data$result$0$specia !== void 0 ? _data$result$0$specia : [];
+            returnData = data.result;
           }
 
           return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -19430,15 +19439,18 @@ var GET_SPECIALITY_DATA = createAsyncThunk("OrganizationRegisterPatientApiSlice/
     }
   }, _callee13, null, [[2, 13]]);
 })));
-var GET_FINANCIAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfinancial", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
+var GET_SPECIALITY_DATA = createAsyncThunk("OrganizationRegisterPatientApiSlice/getspeciality", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
       _ref28,
       rejectWithValue,
-      _payload$patientId2,
-      patientId,
+      _payload$id,
+      id,
       body,
       data,
       returnData,
+      _data$result$0$specia,
+      _data$result,
+      _data$result$,
       _args14 = arguments;
 
   return regeneratorRuntime.wrap(function _callee14$(_context14) {
@@ -19448,12 +19460,12 @@ var GET_FINANCIAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfin
           payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
           _ref28 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref28.rejectWithValue;
           _context14.prev = 2;
-          _payload$patientId2 = payload.patientId, patientId = _payload$patientId2 === void 0 ? "" : _payload$patientId2;
+          _payload$id = payload.id, id = _payload$id === void 0 ? "" : _payload$id;
           body = {
             db_name: dbName,
-            entity: "Account",
-            filter: queries$b["codablemasterGetFinancial"].query(patientId),
-            return_fields: queries$b["codablemasterGetFinancial"].returnFields
+            entity: "Organization",
+            filter: "Organization.id==".concat(id, " && Organization.activestatus==true"),
+            return_fields: "{specialty:DOCUMENT(Organization.specialtyDetails[*].specialty)}"
           };
           _context14.next = 7;
           return fetchData$3({
@@ -19465,7 +19477,7 @@ var GET_FINANCIAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfin
           returnData = [];
 
           if (Array.isArray(data.result)) {
-            returnData = data.result;
+            returnData = (_data$result$0$specia = (_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$.specialty) !== null && _data$result$0$specia !== void 0 ? _data$result$0$specia : [];
           }
 
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -19486,13 +19498,12 @@ var GET_FINANCIAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfin
     }
   }, _callee14, null, [[2, 13]]);
 })));
-var GET_ENCOUNTER_HEADER = createAsyncThunk("OrganizationRegisterPatientApiSlice/getEncounterHeader", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
+var GET_FINANCIAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getfinancial", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
   var payload,
       _ref30,
       rejectWithValue,
-      _payload$patientId3,
+      _payload$patientId2,
       patientId,
-      encounterId,
       body,
       data,
       returnData,
@@ -19505,13 +19516,12 @@ var GET_ENCOUNTER_HEADER = createAsyncThunk("OrganizationRegisterPatientApiSlice
           payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
           _ref30 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref30.rejectWithValue;
           _context15.prev = 2;
-          _payload$patientId3 = payload.patientId, patientId = _payload$patientId3 === void 0 ? "" : _payload$patientId3, encounterId = payload.encounterId;
+          _payload$patientId2 = payload.patientId, patientId = _payload$patientId2 === void 0 ? "" : _payload$patientId2;
           body = {
             db_name: dbName,
-            entity: "Encounter",
-            filter: "Encounter.patient_id == ".concat(patientId, " && Encounter.id==").concat(encounterId, " && Encounter.activestatus == true"),
-            return_fields: "merge({id:adqolcEncounter.id},{_id:adqolcEncounter._id},{_key:adqolcEncounter._key},{encounterdate:adqolcEncounter.encounterdate},{encounter_no:adqolcEncounter.encounter_no},{type:document(adqolcEncounter.type)[*].display},{visit_type:adqolcEncounter.visit_type},{location:(for doc in adqolcEncounter.location for loc in LocationMaster filter loc._id == doc.location_id return document(document(loc.locationType).coding))},{Practitioner_id:(for part in adqolcEncounter.participant for practId in Practitioner filter practId.id == part.Practitioner_id return {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))})),communication:document(practId.communication)[*]} )},{PractitionerRole_id:(for part in adqolcEncounter.participant for practRole in PractitionerRole filter practRole.id == part.PractitionerRole_id return document(document(practRole.role).coding) )})",
-            sort: "Encounter.encounterdate desc"
+            entity: "Account",
+            filter: queries$b["codablemasterGetFinancial"].query(patientId),
+            return_fields: queries$b["codablemasterGetFinancial"].returnFields
           };
           _context15.next = 7;
           return fetchData$3({
@@ -19544,10 +19554,116 @@ var GET_ENCOUNTER_HEADER = createAsyncThunk("OrganizationRegisterPatientApiSlice
     }
   }, _callee15, null, [[2, 13]]);
 })));
-var GET_FERERRAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getreferral", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
+var SOFT_DELETE_FINANCIAL_PAYER = createAsyncThunk("OrganizationRegisterPatientApiSlice/softDeleteFinancialPayer", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
   var payload,
       _ref32,
       rejectWithValue,
+      _payload$_key,
+      _key,
+      body,
+      data,
+      _args16 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee16$(_context16) {
+    while (1) {
+      switch (_context16.prev = _context16.next) {
+        case 0:
+          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+          _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
+          _context16.prev = 2;
+          _payload$_key = payload._key, _key = _payload$_key === void 0 ? "" : _payload$_key;
+          body = {
+            db_name: dbName,
+            entity: "Account",
+            filter: "Account._key=='".concat(_key, "'")
+          };
+          _context16.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(body)
+          }, __Soft_Delete__);
+
+        case 7:
+          data = _context16.sent;
+          return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: data
+          }));
+
+        case 11:
+          _context16.prev = 11;
+          _context16.t0 = _context16["catch"](2);
+          return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context16.t0.message
+          })));
+
+        case 14:
+        case "end":
+          return _context16.stop();
+      }
+    }
+  }, _callee16, null, [[2, 11]]);
+})));
+var GET_ENCOUNTER_HEADER = createAsyncThunk("OrganizationRegisterPatientApiSlice/getEncounterHeader", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
+  var payload,
+      _ref34,
+      rejectWithValue,
+      _payload$patientId3,
+      patientId,
+      encounterId,
+      body,
+      data,
+      returnData,
+      _args17 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee17$(_context17) {
+    while (1) {
+      switch (_context17.prev = _context17.next) {
+        case 0:
+          payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
+          _ref34 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
+          _context17.prev = 2;
+          _payload$patientId3 = payload.patientId, patientId = _payload$patientId3 === void 0 ? "" : _payload$patientId3, encounterId = payload.encounterId;
+          body = {
+            db_name: dbName,
+            entity: "Encounter",
+            filter: "Encounter.patient_id == ".concat(patientId, " && Encounter.id==").concat(encounterId, " && Encounter.activestatus == true"),
+            return_fields: "merge({id:adqolcEncounter.id},{_id:adqolcEncounter._id},{_key:adqolcEncounter._key},{encounterdate:adqolcEncounter.encounterdate},{encounter_no:adqolcEncounter.encounter_no},{type:document(adqolcEncounter.type)[*].display},{visit_type:adqolcEncounter.visit_type},{location:(for doc in adqolcEncounter.location for loc in LocationMaster filter loc._id == doc.location_id return document(document(loc.locationType).coding))},{Practitioner_id:(for part in adqolcEncounter.participant for practId in Practitioner filter practId.id == part.Practitioner_id return {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))})),communication:document(practId.communication)[*]} )},{PractitionerRole_id:(for part in adqolcEncounter.participant for practRole in PractitionerRole filter practRole.id == part.PractitionerRole_id return document(document(practRole.role).coding) )})",
+            sort: "Encounter.encounterdate desc"
+          };
+          _context17.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(body)
+          }, __readDocumentUrl__);
+
+        case 7:
+          data = _context17.sent;
+          returnData = [];
+
+          if (Array.isArray(data.result)) {
+            returnData = data.result;
+          }
+
+          return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+            data: returnData
+          }));
+
+        case 13:
+          _context17.prev = 13;
+          _context17.t0 = _context17["catch"](2);
+          return _context17.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context17.t0.message
+          })));
+
+        case 16:
+        case "end":
+          return _context17.stop();
+      }
+    }
+  }, _callee17, null, [[2, 13]]);
+})));
+var GET_FERERRAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getreferral", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
+  var payload,
+      _ref36,
+      rejectWithValue,
       _payload$patientid,
       patientid,
       _payload$reffId,
@@ -19586,15 +19702,15 @@ var GET_FERERRAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getrefe
       _returnData15,
       _returnData15$,
       info,
-      _args16 = arguments;
+      _args18 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee16$(_context16) {
+  return regeneratorRuntime.wrap(function _callee18$(_context18) {
     while (1) {
-      switch (_context16.prev = _context16.next) {
+      switch (_context18.prev = _context18.next) {
         case 0:
-          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
-          _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
-          _context16.prev = 2;
+          payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
+          _ref36 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
+          _context18.prev = 2;
           _payload$patientid = payload.patientid, patientid = _payload$patientid === void 0 ? "" : _payload$patientid, _payload$reffId = payload.reffId, reffId = _payload$reffId === void 0 ? "" : _payload$reffId;
           body = {
             db_name: dbName,
@@ -19602,13 +19718,13 @@ var GET_FERERRAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getrefe
             filter: queries$b["codablemasterGetReferral"].query(patientid, reffId),
             return_fields: queries$b["codablemasterGetReferral"].returnFields
           };
-          _context16.next = 7;
+          _context18.next = 7;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 7:
-          data = _context16.sent;
+          data = _context18.sent;
           returnData = [];
 
           if (Array.isArray(data.result)) {
@@ -19641,42 +19757,42 @@ var GET_FERERRAL = createAsyncThunk("OrganizationRegisterPatientApiSlice/getrefe
             returnData[0] = _objectSpread2(_objectSpread2({}, returnData[0]), info);
           }
 
-          return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
         case 13:
-          _context16.prev = 13;
-          _context16.t0 = _context16["catch"](2);
-          return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context16.t0.message
+          _context18.prev = 13;
+          _context18.t0 = _context18["catch"](2);
+          return _context18.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context18.t0.message
           })));
 
         case 16:
         case "end":
-          return _context16.stop();
+          return _context18.stop();
       }
     }
-  }, _callee16, null, [[2, 13]]);
+  }, _callee18, null, [[2, 13]]);
 })));
-var GET_PATIENT_APPOINTMENT = createAsyncThunk("OrganizationRegisterPatientApiSlice/getappointment", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
+var GET_PATIENT_APPOINTMENT = createAsyncThunk("OrganizationRegisterPatientApiSlice/getappointment", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
   var payload,
-      _ref34,
+      _ref38,
       rejectWithValue,
       _payload$appointmentI,
       appointmentId,
       body,
       data,
       returnData,
-      _args17 = arguments;
+      _args19 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee17$(_context17) {
+  return regeneratorRuntime.wrap(function _callee19$(_context19) {
     while (1) {
-      switch (_context17.prev = _context17.next) {
+      switch (_context19.prev = _context19.next) {
         case 0:
-          payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
-          _ref34 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
-          _context17.prev = 2;
+          payload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
+          _ref38 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
+          _context19.prev = 2;
           _payload$appointmentI = payload.appointmentId, appointmentId = _payload$appointmentI === void 0 ? "" : _payload$appointmentI;
           body = {
             db_name: dbName,
@@ -19684,40 +19800,40 @@ var GET_PATIENT_APPOINTMENT = createAsyncThunk("OrganizationRegisterPatientApiSl
             filter: queries$b["codablemasterGetAppointment"].query(appointmentId),
             return_fields: queries$b["codablemasterGetAppointment"].returnFields
           };
-          _context17.next = 7;
+          _context19.next = 7;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 7:
-          data = _context17.sent;
+          data = _context19.sent;
           returnData = [];
 
           if (Array.isArray(data.result)) {
             returnData = data.result;
           }
 
-          return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          return _context19.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
         case 13:
-          _context17.prev = 13;
-          _context17.t0 = _context17["catch"](2);
-          return _context17.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context17.t0.message
+          _context19.prev = 13;
+          _context19.t0 = _context19["catch"](2);
+          return _context19.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context19.t0.message
           })));
 
         case 16:
         case "end":
-          return _context17.stop();
+          return _context19.stop();
       }
     }
-  }, _callee17, null, [[2, 13]]);
+  }, _callee19, null, [[2, 13]]);
 })));
-var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpatientname", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
+var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpatientname", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
   var payload,
-      _ref36,
+      _ref40,
       rejectWithValue,
       _patientName$split,
       _patientName$split2,
@@ -19730,15 +19846,15 @@ var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
       body,
       data,
       returnData,
-      _args18 = arguments;
+      _args20 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee18$(_context18) {
+  return regeneratorRuntime.wrap(function _callee20$(_context20) {
     while (1) {
-      switch (_context18.prev = _context18.next) {
+      switch (_context20.prev = _context20.next) {
         case 0:
-          payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
-          _ref36 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
-          _context18.prev = 2;
+          payload = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
+          _ref40 = _args20.length > 1 ? _args20[1] : undefined, rejectWithValue = _ref40.rejectWithValue;
+          _context20.prev = 2;
           _payload$patientName = payload.patientName, patientName = _payload$patientName === void 0 ? "" : _payload$patientName;
           firstName = (_patientName$split = patientName === null || patientName === void 0 ? void 0 : patientName.split(" ", 1)) !== null && _patientName$split !== void 0 ? _patientName$split : "";
           secondName = (_patientName$split2 = patientName === null || patientName === void 0 ? void 0 : patientName.split(" ", 2)) !== null && _patientName$split2 !== void 0 ? _patientName$split2 : "";
@@ -19754,40 +19870,40 @@ var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
             }),
             return_fields: queries$b["codablemasterGetPatientname"].returnFields
           };
-          _context18.next = 11;
+          _context20.next = 11;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 11:
-          data = _context18.sent;
+          data = _context20.sent;
           returnData = [];
 
           if (Array.isArray(data.result)) {
             returnData = data.result;
           }
 
-          return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          return _context20.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
         case 17:
-          _context18.prev = 17;
-          _context18.t0 = _context18["catch"](2);
-          return _context18.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context18.t0.message
+          _context20.prev = 17;
+          _context20.t0 = _context20["catch"](2);
+          return _context20.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context20.t0.message
           })));
 
         case 20:
         case "end":
-          return _context18.stop();
+          return _context20.stop();
       }
     }
-  }, _callee18, null, [[2, 17]]);
+  }, _callee20, null, [[2, 17]]);
 })));
-var GET_PATIENT_TYPEID = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpatienttypeid", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
+var GET_PATIENT_TYPEID = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpatienttypeid", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee21() {
   var payload,
-      _ref38,
+      _ref42,
       rejectWithValue,
       _payload$idnumber,
       idnumber,
@@ -19795,88 +19911,89 @@ var GET_PATIENT_TYPEID = createAsyncThunk("OrganizationRegisterPatientApiSlice/g
       idsourcecode,
       body,
       data,
-      _args19 = arguments;
+      _args21 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee19$(_context19) {
+  return regeneratorRuntime.wrap(function _callee21$(_context21) {
     while (1) {
-      switch (_context19.prev = _context19.next) {
+      switch (_context21.prev = _context21.next) {
         case 0:
-          payload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
-          _ref38 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
-          _context19.prev = 2;
+          payload = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
+          _ref42 = _args21.length > 1 ? _args21[1] : undefined, rejectWithValue = _ref42.rejectWithValue;
+          _context21.prev = 2;
           _payload$idnumber = payload.idnumber, idnumber = _payload$idnumber === void 0 ? "" : _payload$idnumber, _payload$idsourcecode = payload.idsourcecode, idsourcecode = _payload$idsourcecode === void 0 ? "" : _payload$idsourcecode;
           body = {
             db_name: dbName,
             filter: JSON.parse("{\n                    \"idnumber\":\"".concat(idnumber, "\",\"idsourcecode\":\"").concat(idsourcecode, "\"\n                }")),
             queryid: "8ffac13e-b147-4568-a13e-ecf9c07c0d92"
           };
-          _context19.next = 7;
+          _context21.next = 7;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __baseUrl__);
 
         case 7:
-          data = _context19.sent;
-          return _context19.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          data = _context21.sent;
+          return _context21.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: data
           }));
 
         case 11:
-          _context19.prev = 11;
-          _context19.t0 = _context19["catch"](2);
-          return _context19.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context19.t0.message
+          _context21.prev = 11;
+          _context21.t0 = _context21["catch"](2);
+          return _context21.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context21.t0.message
           })));
 
         case 14:
         case "end":
-          return _context19.stop();
+          return _context21.stop();
       }
     }
-  }, _callee19, null, [[2, 11]]);
+  }, _callee21, null, [[2, 11]]);
 })));
-var GET_ENCOUNTER_STATUS = createAsyncThunk("OrganizationRegisterPatientApiSlice/getEncounterStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
+var GET_ENCOUNTER_STATUS = createAsyncThunk("OrganizationRegisterPatientApiSlice/getEncounterStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22() {
   var payload,
-      _ref40,
+      _ref44,
       rejectWithValue,
       data,
-      _args20 = arguments;
+      _args22 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee20$(_context20) {
+  return regeneratorRuntime.wrap(function _callee22$(_context22) {
     while (1) {
-      switch (_context20.prev = _context20.next) {
+      switch (_context22.prev = _context22.next) {
         case 0:
-          payload = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
-          _ref40 = _args20.length > 1 ? _args20[1] : undefined, rejectWithValue = _ref40.rejectWithValue;
-          _context20.prev = 2;
-          _context20.next = 5;
+          payload = _args22.length > 0 && _args22[0] !== undefined ? _args22[0] : {};
+          _ref44 = _args22.length > 1 ? _args22[1] : undefined, rejectWithValue = _ref44.rejectWithValue;
+          _context22.prev = 2;
+          _context22.next = 5;
           return fetchData$3({
             body: JSON.stringify(registerQuery.statusRead())
           }, __readDocumentUrl__);
 
         case 5:
-          data = _context20.sent;
-          return _context20.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          data = _context22.sent;
+          return _context22.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: data.result
           }));
 
         case 9:
-          _context20.prev = 9;
-          _context20.t0 = _context20["catch"](2);
-          return _context20.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context20.t0.message
+          _context22.prev = 9;
+          _context22.t0 = _context22["catch"](2);
+          return _context22.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context22.t0.message
           })));
 
         case 12:
         case "end":
-          return _context20.stop();
+          return _context22.stop();
       }
     }
-  }, _callee20, null, [[2, 9]]);
+  }, _callee22, null, [[2, 9]]);
 })));
 var OrganizationRegisterPatientApiSlice = createSlice({
   name: "OrganizationRegisterPatientApiSlice",
   initialState: {
+    softDeleteFinancialPayer: _objectSpread2({}, defaultState.Info),
     specilitytype: _objectSpread2({}, defaultState.Info),
     specilityname: _objectSpread2({}, defaultState.Info),
     oraganizationRegisterPatient: _objectSpread2({}, defaultState.Info),
@@ -19896,208 +20013,229 @@ var OrganizationRegisterPatientApiSlice = createSlice({
     getEncounterHeader: _objectSpread2({}, defaultState.Info),
     getEncounterStatus: _objectSpread2({}, defaultState.Info),
     getPractitionerType: _objectSpread2({}, defaultState.Info),
-    getPractitionerName: _objectSpread2({}, defaultState.Info)
+    getPractitionerName: _objectSpread2({}, defaultState.Info),
+    getPatient_id: _objectSpread2({}, defaultState.Info)
   },
-  extraReducers: (_extraReducers$r = {}, _defineProperty(_extraReducers$r, GET_PRACTITIONER_TYPE.fulfilled, function (state, action) {
+  extraReducers: (_extraReducers$r = {}, _defineProperty(_extraReducers$r, SOFT_DELETE_FINANCIAL_PAYER.fulfilled, function (state, action) {
     var _action$payload;
 
-    state.getPractitionerType = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+    state.softDeleteFinancialPayer = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+  }), _defineProperty(_extraReducers$r, SOFT_DELETE_FINANCIAL_PAYER.pending, function (state, action) {
+    state.softDeleteFinancialPayer.loading = true;
+  }), _defineProperty(_extraReducers$r, SOFT_DELETE_FINANCIAL_PAYER.rejected, function (state, action) {
+    var _action$payload2;
+
+    state.softDeleteFinancialPayer = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+  }), _defineProperty(_extraReducers$r, GET_PATIENT__ID_BY_ID.fulfilled, function (state, action) {
+    var _action$payload3;
+
+    state.getPatient_id = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
+  }), _defineProperty(_extraReducers$r, GET_PATIENT__ID_BY_ID.pending, function (state, action) {
+    state.getPatient_id.loading = true;
+  }), _defineProperty(_extraReducers$r, GET_PATIENT__ID_BY_ID.rejected, function (state, action) {
+    var _action$payload4;
+
+    state.getPatient_id = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
+  }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_TYPE.fulfilled, function (state, action) {
+    var _action$payload5;
+
+    state.getPractitionerType = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_TYPE.pending, function (state, action) {
     state.getPractitionerType.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_TYPE.rejected, function (state, action) {
-    var _action$payload2;
+    var _action$payload6;
 
-    state.getPractitionerType = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+    state.getPractitionerType = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_NAME.fulfilled, function (state, action) {
-    var _action$payload3;
+    var _action$payload7;
 
-    state.getPractitionerName = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
+    state.getPractitionerName = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_NAME.pending, function (state, action) {
     state.getPractitionerName.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_NAME.rejected, function (state, action) {
-    var _action$payload4;
+    var _action$payload8;
 
-    state.getPractitionerName = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
+    state.getPractitionerName = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_NAME.fulfilled, function (state, action) {
-    var _action$payload5;
+    var _action$payload9;
 
-    state.getpatientname = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
+    state.getpatientname = (_action$payload9 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload9 !== void 0 ? _action$payload9 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_NAME.pending, function (state, action) {
     state.getpatientname.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PATIENT_NAME.rejected, function (state, action) {
-    var _action$payload6;
+    var _action$payload10;
 
-    state.getpatientname = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
+    state.getpatientname = (_action$payload10 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload10 !== void 0 ? _action$payload10 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_APPOINTMENT.fulfilled, function (state, action) {
-    var _action$payload7;
+    var _action$payload11;
 
-    state.getappointment = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
+    state.getappointment = (_action$payload11 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload11 !== void 0 ? _action$payload11 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_APPOINTMENT.pending, function (state, action) {
     state.getappointment.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PATIENT_APPOINTMENT.rejected, function (state, action) {
-    var _action$payload8;
+    var _action$payload12;
 
-    state.getappointment = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
+    state.getappointment = (_action$payload12 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload12 !== void 0 ? _action$payload12 : {};
   }), _defineProperty(_extraReducers$r, GET_FERERRAL.fulfilled, function (state, action) {
-    var _action$payload9;
+    var _action$payload13;
 
-    state.getreferral = (_action$payload9 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload9 !== void 0 ? _action$payload9 : {};
+    state.getreferral = (_action$payload13 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload13 !== void 0 ? _action$payload13 : {};
   }), _defineProperty(_extraReducers$r, GET_FERERRAL.pending, function (state, action) {
     state.getreferral.loading = true;
   }), _defineProperty(_extraReducers$r, GET_FERERRAL.rejected, function (state, action) {
-    var _action$payload10;
+    var _action$payload14;
 
-    state.getreferral = (_action$payload10 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload10 !== void 0 ? _action$payload10 : {};
+    state.getreferral = (_action$payload14 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload14 !== void 0 ? _action$payload14 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REGISTER_PATIENT.fulfilled, function (state, action) {
-    var _action$payload11;
+    var _action$payload15;
 
-    state.oraganizationRegisterPatient = (_action$payload11 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload11 !== void 0 ? _action$payload11 : {};
+    state.oraganizationRegisterPatient = (_action$payload15 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload15 !== void 0 ? _action$payload15 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REGISTER_PATIENT.pending, function (state, action) {
     state.oraganizationRegisterPatient.loading = true;
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REGISTER_PATIENT.rejected, function (state, action) {
-    var _action$payload12;
+    var _action$payload16;
 
-    state.oraganizationRegisterPatient = (_action$payload12 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload12 !== void 0 ? _action$payload12 : {};
+    state.oraganizationRegisterPatient = (_action$payload16 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload16 !== void 0 ? _action$payload16 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_VISIT_REGISTRATION.fulfilled, function (state, action) {
-    var _action$payload13;
+    var _action$payload17;
 
-    state.oraganizationvisitRegister = (_action$payload13 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload13 !== void 0 ? _action$payload13 : {};
+    state.oraganizationvisitRegister = (_action$payload17 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload17 !== void 0 ? _action$payload17 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_VISIT_REGISTRATION.pending, function (state, action) {
     state.oraganizationvisitRegister.loading = true;
   }), _defineProperty(_extraReducers$r, ORGANIZATION_VISIT_REGISTRATION.rejected, function (state, action) {
-    var _action$payload14;
+    var _action$payload18;
 
-    state.oraganizationvisitRegister = (_action$payload14 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload14 !== void 0 ? _action$payload14 : {};
+    state.oraganizationvisitRegister = (_action$payload18 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload18 !== void 0 ? _action$payload18 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REFERRAL_REGISTRATION.fulfilled, function (state, action) {
-    var _action$payload15;
+    var _action$payload19;
 
-    state.oraganizationreferralRegister = (_action$payload15 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload15 !== void 0 ? _action$payload15 : {};
+    state.oraganizationreferralRegister = (_action$payload19 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload19 !== void 0 ? _action$payload19 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REFERRAL_REGISTRATION.pending, function (state, action) {
     state.oraganizationreferralRegister.loading = true;
   }), _defineProperty(_extraReducers$r, ORGANIZATION_REFERRAL_REGISTRATION.rejected, function (state, action) {
-    var _action$payload16;
+    var _action$payload20;
 
-    state.oraganizationreferralRegister = (_action$payload16 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload16 !== void 0 ? _action$payload16 : {};
+    state.oraganizationreferralRegister = (_action$payload20 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload20 !== void 0 ? _action$payload20 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FILTER_BY_PATIENT.fulfilled, function (state, action) {
-    var _action$payload17;
+    var _action$payload21;
 
-    state.oraganizationfilterbypatient = (_action$payload17 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload17 !== void 0 ? _action$payload17 : {};
+    state.oraganizationfilterbypatient = (_action$payload21 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload21 !== void 0 ? _action$payload21 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FILTER_BY_PATIENT.pending, function (state, action) {
     state.oraganizationfilterbypatient.loading = true;
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FILTER_BY_PATIENT.rejected, function (state, action) {
-    var _action$payload18;
+    var _action$payload22;
 
-    state.oraganizationfilterbypatient = (_action$payload18 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload18 !== void 0 ? _action$payload18 : {};
+    state.oraganizationfilterbypatient = (_action$payload22 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload22 !== void 0 ? _action$payload22 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FINANCIAL_REGISTRATION.fulfilled, function (state, action) {
-    var _action$payload19;
+    var _action$payload23;
 
-    state.oraganizationfinancialregister = (_action$payload19 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload19 !== void 0 ? _action$payload19 : {};
+    state.oraganizationfinancialregister = (_action$payload23 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload23 !== void 0 ? _action$payload23 : {};
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FINANCIAL_REGISTRATION.pending, function (state, action) {
     state.oraganizationfinancialregister.loading = true;
   }), _defineProperty(_extraReducers$r, ORGANIZATION_FINANCIAL_REGISTRATION.rejected, function (state, action) {
-    var _action$payload20;
+    var _action$payload24;
 
-    state.oraganizationfinancialregister = (_action$payload20 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload20 !== void 0 ? _action$payload20 : {};
+    state.oraganizationfinancialregister = (_action$payload24 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload24 !== void 0 ? _action$payload24 : {};
   }), _defineProperty(_extraReducers$r, GET_FACILITY_TYPE.fulfilled, function (state, action) {
-    var _action$payload21;
+    var _action$payload25;
 
-    state.specilitytype = (_action$payload21 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload21 !== void 0 ? _action$payload21 : {};
+    state.specilitytype = (_action$payload25 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload25 !== void 0 ? _action$payload25 : {};
   }), _defineProperty(_extraReducers$r, GET_FACILITY_TYPE.pending, function (state, action) {
     state.specilitytype.loading = true;
   }), _defineProperty(_extraReducers$r, GET_FACILITY_TYPE.rejected, function (state, action) {
-    var _action$payload22;
+    var _action$payload26;
 
-    state.specilitytype = (_action$payload22 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload22 !== void 0 ? _action$payload22 : {};
+    state.specilitytype = (_action$payload26 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload26 !== void 0 ? _action$payload26 : {};
   }), _defineProperty(_extraReducers$r, GET_FACILITY_NAME.fulfilled, function (state, action) {
-    var _action$payload23;
+    var _action$payload27;
 
-    state.specilityname = (_action$payload23 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload23 !== void 0 ? _action$payload23 : {};
+    state.specilityname = (_action$payload27 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload27 !== void 0 ? _action$payload27 : {};
   }), _defineProperty(_extraReducers$r, GET_FACILITY_NAME.pending, function (state, action) {
     state.specilityname.loading = true;
   }), _defineProperty(_extraReducers$r, GET_FACILITY_NAME.rejected, function (state, action) {
-    var _action$payload24;
+    var _action$payload28;
 
-    state.specilityname = (_action$payload24 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload24 !== void 0 ? _action$payload24 : {};
+    state.specilityname = (_action$payload28 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload28 !== void 0 ? _action$payload28 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER.fulfilled, function (state, action) {
-    var _action$payload25;
+    var _action$payload29;
 
-    state.practitioner = (_action$payload25 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload25 !== void 0 ? _action$payload25 : {};
+    state.practitioner = (_action$payload29 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload29 !== void 0 ? _action$payload29 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER.pending, function (state, action) {
     state.practitioner.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER.rejected, function (state, action) {
-    var _action$payload26;
+    var _action$payload30;
 
-    state.practitioner = (_action$payload26 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload26 !== void 0 ? _action$payload26 : {};
+    state.practitioner = (_action$payload30 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload30 !== void 0 ? _action$payload30 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONERS.fulfilled, function (state, action) {
-    var _action$payload27;
+    var _action$payload31;
 
-    state.practitioners = (_action$payload27 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload27 !== void 0 ? _action$payload27 : {};
+    state.practitioners = (_action$payload31 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload31 !== void 0 ? _action$payload31 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONERS.pending, function (state, action) {
     state.practitioners.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONERS.rejected, function (state, action) {
-    var _action$payload28;
+    var _action$payload32;
 
-    state.practitioners = (_action$payload28 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload28 !== void 0 ? _action$payload28 : {};
+    state.practitioners = (_action$payload32 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload32 !== void 0 ? _action$payload32 : {};
   }), _defineProperty(_extraReducers$r, GET_SPECIALITY_DATA.fulfilled, function (state, action) {
-    var _action$payload29;
+    var _action$payload33;
 
-    state.speciality = (_action$payload29 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload29 !== void 0 ? _action$payload29 : {};
+    state.speciality = (_action$payload33 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload33 !== void 0 ? _action$payload33 : {};
   }), _defineProperty(_extraReducers$r, GET_SPECIALITY_DATA.pending, function (state, action) {
     state.speciality.loading = true;
   }), _defineProperty(_extraReducers$r, GET_SPECIALITY_DATA.rejected, function (state, action) {
-    var _action$payload30;
+    var _action$payload34;
 
-    state.speciality = (_action$payload30 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload30 !== void 0 ? _action$payload30 : {};
+    state.speciality = (_action$payload34 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload34 !== void 0 ? _action$payload34 : {};
   }), _defineProperty(_extraReducers$r, GET_FINANCIAL.fulfilled, function (state, action) {
-    var _action$payload31;
+    var _action$payload35;
 
-    state.getfinancial = (_action$payload31 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload31 !== void 0 ? _action$payload31 : {};
+    state.getfinancial = (_action$payload35 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload35 !== void 0 ? _action$payload35 : {};
   }), _defineProperty(_extraReducers$r, GET_FINANCIAL.pending, function (state, action) {
     state.getfinancial.loading = true;
   }), _defineProperty(_extraReducers$r, GET_FINANCIAL.rejected, function (state, action) {
-    var _action$payload32;
+    var _action$payload36;
 
-    state.getfinancial = (_action$payload32 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload32 !== void 0 ? _action$payload32 : {};
+    state.getfinancial = (_action$payload36 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload36 !== void 0 ? _action$payload36 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_ROLE.fulfilled, function (state, action) {
-    var _action$payload33;
+    var _action$payload37;
 
-    state.getpractitionerrole = (_action$payload33 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload33 !== void 0 ? _action$payload33 : {};
+    state.getpractitionerrole = (_action$payload37 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload37 !== void 0 ? _action$payload37 : {};
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_ROLE.pending, function (state, action) {
     state.getpractitionerrole.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PRACTITIONER_ROLE.rejected, function (state, action) {
-    var _action$payload34;
+    var _action$payload38;
 
-    state.getpractitionerrole = (_action$payload34 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload34 !== void 0 ? _action$payload34 : {};
+    state.getpractitionerrole = (_action$payload38 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload38 !== void 0 ? _action$payload38 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_TYPEID.fulfilled, function (state, action) {
-    var _action$payload35;
+    var _action$payload39;
 
-    state.getpatientid = (_action$payload35 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload35 !== void 0 ? _action$payload35 : {};
+    state.getpatientid = (_action$payload39 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload39 !== void 0 ? _action$payload39 : {};
   }), _defineProperty(_extraReducers$r, GET_PATIENT_TYPEID.pending, function (state, action) {
     state.getpatientid.loading = true;
   }), _defineProperty(_extraReducers$r, GET_PATIENT_TYPEID.rejected, function (state, action) {
-    var _action$payload36;
+    var _action$payload40;
 
-    state.getpatientid = (_action$payload36 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload36 !== void 0 ? _action$payload36 : {};
+    state.getpatientid = (_action$payload40 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload40 !== void 0 ? _action$payload40 : {};
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_HEADER.fulfilled, function (state, action) {
-    var _action$payload37;
+    var _action$payload41;
 
-    state.getEncounterHeader = (_action$payload37 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload37 !== void 0 ? _action$payload37 : {};
+    state.getEncounterHeader = (_action$payload41 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload41 !== void 0 ? _action$payload41 : {};
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_HEADER.pending, function (state, action) {
     state.getEncounterHeader.loading = true;
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_HEADER.rejected, function (state, action) {
-    var _action$payload38;
+    var _action$payload42;
 
-    state.getEncounterHeader = (_action$payload38 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload38 !== void 0 ? _action$payload38 : {};
+    state.getEncounterHeader = (_action$payload42 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload42 !== void 0 ? _action$payload42 : {};
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_STATUS.fulfilled, function (state, action) {
-    var _action$payload39;
+    var _action$payload43;
 
-    state.getEncounterStatus = (_action$payload39 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload39 !== void 0 ? _action$payload39 : {};
+    state.getEncounterStatus = (_action$payload43 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload43 !== void 0 ? _action$payload43 : {};
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_STATUS.pending, function (state, action) {
     state.getEncounterStatus.loading = true;
   }), _defineProperty(_extraReducers$r, GET_ENCOUNTER_STATUS.rejected, function (state, action) {
-    var _action$payload40;
+    var _action$payload44;
 
-    state.getEncounterStatus = (_action$payload40 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload40 !== void 0 ? _action$payload40 : {};
+    state.getEncounterStatus = (_action$payload44 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload44 !== void 0 ? _action$payload44 : {};
   }), _extraReducers$r)
 });
 var oraganizationRegisterPatientActions = {
@@ -20120,7 +20258,9 @@ var oraganizationRegisterPatientActions = {
   GET_ENCOUNTER_HEADER: GET_ENCOUNTER_HEADER,
   GET_ENCOUNTER_STATUS: GET_ENCOUNTER_STATUS,
   GET_PRACTITIONER_TYPE: GET_PRACTITIONER_TYPE,
-  GET_PRACTITIONER_NAME: GET_PRACTITIONER_NAME
+  GET_PRACTITIONER_NAME: GET_PRACTITIONER_NAME,
+  GET_PATIENT__ID_BY_ID: GET_PATIENT__ID_BY_ID,
+  SOFT_DELETE_FINANCIAL_PAYER: SOFT_DELETE_FINANCIAL_PAYER
 };
 var OrganizationRegisterPatientApiSlice$1 = OrganizationRegisterPatientApiSlice.reducer;
 
@@ -21524,7 +21664,7 @@ var HIGH_PRIORITY_PATIENT = createAsyncThunk("dashboardApiSlice/highPriorityPati
 
               arr.push(_objectSpread2({
                 profile_pic: item === null || item === void 0 ? void 0 : (_item$patient_id$ = item.patient_id[0]) === null || _item$patient_id$ === void 0 ? void 0 : (_item$patient_id$$pho = _item$patient_id$.photo[0]) === null || _item$patient_id$$pho === void 0 ? void 0 : _item$patient_id$$pho.url,
-                name: makeName((item === null || item === void 0 ? void 0 : (_item$patient_id = item.patient_id) === null || _item$patient_id === void 0 ? void 0 : (_item$patient_id$2 = _item$patient_id[0]) === null || _item$patient_id$2 === void 0 ? void 0 : (_item$patient_id$2$na = _item$patient_id$2.name) === null || _item$patient_id$2$na === void 0 ? void 0 : _item$patient_id$2$na[0]) || {}),
+                name: makeName$1((item === null || item === void 0 ? void 0 : (_item$patient_id = item.patient_id) === null || _item$patient_id === void 0 ? void 0 : (_item$patient_id$2 = _item$patient_id[0]) === null || _item$patient_id$2 === void 0 ? void 0 : (_item$patient_id$2$na = _item$patient_id$2.name) === null || _item$patient_id$2$na === void 0 ? void 0 : _item$patient_id$2$na[0]) || {}),
                 reasonValue: item === null || item === void 0 ? void 0 : (_item$priorityreason = item.priorityreason) === null || _item$priorityreason === void 0 ? void 0 : _item$priorityreason.ReasonDesc,
                 isEmergency: true,
                 patientPriority: {
@@ -21963,7 +22103,7 @@ var generateReadJSON = function generateReadJSON(data) {
     }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie = data === null || data === void 0 ? void 0 : (_data$Encounter5 = data.Encounter) === null || _data$Encounter5 === void 0 ? void 0 : (_data$Encounter5$pati = _data$Encounter5.patient_id) === null || _data$Encounter5$pati === void 0 ? void 0 : (_data$Encounter5$pati2 = _data$Encounter5$pati[0]) === null || _data$Encounter5$pati2 === void 0 ? void 0 : (_data$Encounter5$pati3 = _data$Encounter5$pati2.photo) === null || _data$Encounter5$pati3 === void 0 ? void 0 : _data$Encounter5$pati3[0]) !== null && _data$Encounter$patie !== void 0 ? _data$Encounter$patie : "",
-    patientName: makeName(data === null || data === void 0 ? void 0 : (_data$Encounter6 = data.Encounter) === null || _data$Encounter6 === void 0 ? void 0 : (_data$Encounter6$pati = _data$Encounter6.patient_id) === null || _data$Encounter6$pati === void 0 ? void 0 : (_data$Encounter6$pati2 = _data$Encounter6$pati[0].name) === null || _data$Encounter6$pati2 === void 0 ? void 0 : _data$Encounter6$pati2[0]) || "",
+    patientName: makeName$1(data === null || data === void 0 ? void 0 : (_data$Encounter6 = data.Encounter) === null || _data$Encounter6 === void 0 ? void 0 : (_data$Encounter6$pati = _data$Encounter6.patient_id) === null || _data$Encounter6$pati === void 0 ? void 0 : (_data$Encounter6$pati2 = _data$Encounter6$pati[0].name) === null || _data$Encounter6$pati2 === void 0 ? void 0 : _data$Encounter6$pati2[0]) || "",
     patientAge: (_data$Encounter$patie2 = data === null || data === void 0 ? void 0 : (_data$Encounter7 = data.Encounter) === null || _data$Encounter7 === void 0 ? void 0 : (_data$Encounter7$pati = _data$Encounter7.patient_id) === null || _data$Encounter7$pati === void 0 ? void 0 : (_data$Encounter7$pati2 = _data$Encounter7$pati[0]) === null || _data$Encounter7$pati2 === void 0 ? void 0 : _data$Encounter7$pati2.age) !== null && _data$Encounter$patie2 !== void 0 ? _data$Encounter$patie2 : "",
     patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter8 = data.Encounter) === null || _data$Encounter8 === void 0 ? void 0 : (_data$Encounter8$pati = _data$Encounter8.patient_id) === null || _data$Encounter8$pati === void 0 ? void 0 : (_data$Encounter8$pati2 = _data$Encounter8$pati[0]) === null || _data$Encounter8$pati2 === void 0 ? void 0 : (_data$Encounter8$pati3 = _data$Encounter8$pati2.gender) === null || _data$Encounter8$pati3 === void 0 ? void 0 : (_data$Encounter8$pati4 = _data$Encounter8$pati3.display) === null || _data$Encounter8$pati4 === void 0 ? void 0 : _data$Encounter8$pati4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter9 = data.Encounter) === null || _data$Encounter9 === void 0 ? void 0 : (_data$Encounter9$pati = _data$Encounter9.patient_id) === null || _data$Encounter9$pati === void 0 ? void 0 : (_data$Encounter9$pati2 = _data$Encounter9$pati[0]) === null || _data$Encounter9$pati2 === void 0 ? void 0 : (_data$Encounter9$pati3 = _data$Encounter9$pati2.gender) === null || _data$Encounter9$pati3 === void 0 ? void 0 : (_data$Encounter9$pati4 = _data$Encounter9$pati3.display) === null || _data$Encounter9$pati4 === void 0 ? void 0 : _data$Encounter9$pati4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter10 = data.Encounter) === null || _data$Encounter10 === void 0 ? void 0 : (_data$Encounter10$pat = _data$Encounter10.patient_id) === null || _data$Encounter10$pat === void 0 ? void 0 : (_data$Encounter10$pat2 = _data$Encounter10$pat[0]) === null || _data$Encounter10$pat2 === void 0 ? void 0 : (_data$Encounter10$pat3 = _data$Encounter10$pat2.gender) === null || _data$Encounter10$pat3 === void 0 ? void 0 : (_data$Encounter10$pat4 = _data$Encounter10$pat3.display) === null || _data$Encounter10$pat4 === void 0 ? void 0 : _data$Encounter10$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie3 = data === null || data === void 0 ? void 0 : (_data$Encounter11 = data.Encounter) === null || _data$Encounter11 === void 0 ? void 0 : (_data$Encounter11$pat = _data$Encounter11.patient_id) === null || _data$Encounter11$pat === void 0 ? void 0 : (_data$Encounter11$pat2 = _data$Encounter11$pat[0]) === null || _data$Encounter11$pat2 === void 0 ? void 0 : _data$Encounter11$pat2.MRN) !== null && _data$Encounter$patie3 !== void 0 ? _data$Encounter$patie3 : "",
@@ -21974,7 +22114,7 @@ var generateReadJSON = function generateReadJSON(data) {
     practitionerType: // data?.Encounter?.participant?.[0]?.type?.[0]?.display ?? "",
     (_data$Encounter$pract2 = data === null || data === void 0 ? void 0 : (_data$Encounter16 = data.Encounter) === null || _data$Encounter16 === void 0 ? void 0 : (_data$Encounter16$pra = _data$Encounter16.practitioner_details) === null || _data$Encounter16$pra === void 0 ? void 0 : (_data$Encounter16$pra2 = _data$Encounter16$pra[0]) === null || _data$Encounter16$pra2 === void 0 ? void 0 : _data$Encounter16$pra2.type) !== null && _data$Encounter$pract2 !== void 0 ? _data$Encounter$pract2 : "",
     practitionerRole: (_data$Encounter$parti = data === null || data === void 0 ? void 0 : (_data$Encounter17 = data.Encounter) === null || _data$Encounter17 === void 0 ? void 0 : (_data$Encounter17$par = _data$Encounter17.participant) === null || _data$Encounter17$par === void 0 ? void 0 : (_data$Encounter17$par2 = _data$Encounter17$par[0]) === null || _data$Encounter17$par2 === void 0 ? void 0 : (_data$Encounter17$par3 = _data$Encounter17$par2.Practitioner_id) === null || _data$Encounter17$par3 === void 0 ? void 0 : (_data$Encounter17$par4 = _data$Encounter17$par3[0]) === null || _data$Encounter17$par4 === void 0 ? void 0 : (_data$Encounter17$par5 = _data$Encounter17$par4.practitioner_role) === null || _data$Encounter17$par5 === void 0 ? void 0 : (_data$Encounter17$par6 = _data$Encounter17$par5[0]) === null || _data$Encounter17$par6 === void 0 ? void 0 : (_data$Encounter17$par7 = _data$Encounter17$par6.role) === null || _data$Encounter17$par7 === void 0 ? void 0 : (_data$Encounter17$par8 = _data$Encounter17$par7[0].coding) === null || _data$Encounter17$par8 === void 0 ? void 0 : (_data$Encounter17$par9 = _data$Encounter17$par8[0]) === null || _data$Encounter17$par9 === void 0 ? void 0 : _data$Encounter17$par9.display) !== null && _data$Encounter$parti !== void 0 ? _data$Encounter$parti : "",
-    practitioner: makeName(data === null || data === void 0 ? void 0 : (_data$Encounter18 = data.Encounter) === null || _data$Encounter18 === void 0 ? void 0 : (_data$Encounter18$par = _data$Encounter18.participant) === null || _data$Encounter18$par === void 0 ? void 0 : (_data$Encounter18$par2 = _data$Encounter18$par[0]) === null || _data$Encounter18$par2 === void 0 ? void 0 : (_data$Encounter18$par3 = _data$Encounter18$par2.Practitioner_id) === null || _data$Encounter18$par3 === void 0 ? void 0 : (_data$Encounter18$par4 = _data$Encounter18$par3[0]) === null || _data$Encounter18$par4 === void 0 ? void 0 : (_data$Encounter18$par5 = _data$Encounter18$par4.name) === null || _data$Encounter18$par5 === void 0 ? void 0 : _data$Encounter18$par5[0]) || "",
+    practitioner: makeName$1(data === null || data === void 0 ? void 0 : (_data$Encounter18 = data.Encounter) === null || _data$Encounter18 === void 0 ? void 0 : (_data$Encounter18$par = _data$Encounter18.participant) === null || _data$Encounter18$par === void 0 ? void 0 : (_data$Encounter18$par2 = _data$Encounter18$par[0]) === null || _data$Encounter18$par2 === void 0 ? void 0 : (_data$Encounter18$par3 = _data$Encounter18$par2.Practitioner_id) === null || _data$Encounter18$par3 === void 0 ? void 0 : (_data$Encounter18$par4 = _data$Encounter18$par3[0]) === null || _data$Encounter18$par4 === void 0 ? void 0 : (_data$Encounter18$par5 = _data$Encounter18$par4.name) === null || _data$Encounter18$par5 === void 0 ? void 0 : _data$Encounter18$par5[0]) || "",
     //FOR ASSIGN QUERY
     practroleId: (_data$Encounter$parti2 = data === null || data === void 0 ? void 0 : (_data$Encounter19 = data.Encounter) === null || _data$Encounter19 === void 0 ? void 0 : (_data$Encounter19$par = _data$Encounter19.participant) === null || _data$Encounter19$par === void 0 ? void 0 : (_data$Encounter19$par2 = _data$Encounter19$par[0]) === null || _data$Encounter19$par2 === void 0 ? void 0 : (_data$Encounter19$par3 = _data$Encounter19$par2.Practitioner_id) === null || _data$Encounter19$par3 === void 0 ? void 0 : (_data$Encounter19$par4 = _data$Encounter19$par3[0]) === null || _data$Encounter19$par4 === void 0 ? void 0 : (_data$Encounter19$par5 = _data$Encounter19$par4.practitioner_role) === null || _data$Encounter19$par5 === void 0 ? void 0 : (_data$Encounter19$par6 = _data$Encounter19$par5[0]) === null || _data$Encounter19$par6 === void 0 ? void 0 : _data$Encounter19$par6._id) !== null && _data$Encounter$parti2 !== void 0 ? _data$Encounter$parti2 : "",
     practitionerId: (_data$Encounter$parti3 = data === null || data === void 0 ? void 0 : (_data$Encounter20 = data.Encounter) === null || _data$Encounter20 === void 0 ? void 0 : (_data$Encounter20$par = _data$Encounter20.participant) === null || _data$Encounter20$par === void 0 ? void 0 : (_data$Encounter20$par2 = _data$Encounter20$par[0]) === null || _data$Encounter20$par2 === void 0 ? void 0 : (_data$Encounter20$par3 = _data$Encounter20$par2.Practitioner_id) === null || _data$Encounter20$par3 === void 0 ? void 0 : _data$Encounter20$par3[0]._id) !== null && _data$Encounter$parti3 !== void 0 ? _data$Encounter$parti3 : "",
@@ -22053,7 +22193,7 @@ var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
     }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie5 = data === null || data === void 0 ? void 0 : (_data$Encounter26 = data.Encounter) === null || _data$Encounter26 === void 0 ? void 0 : (_data$Encounter26$pat = _data$Encounter26.patient_id) === null || _data$Encounter26$pat === void 0 ? void 0 : (_data$Encounter26$pat2 = _data$Encounter26$pat[0]) === null || _data$Encounter26$pat2 === void 0 ? void 0 : (_data$Encounter26$pat3 = _data$Encounter26$pat2.photo) === null || _data$Encounter26$pat3 === void 0 ? void 0 : _data$Encounter26$pat3[0]) !== null && _data$Encounter$patie5 !== void 0 ? _data$Encounter$patie5 : "",
-    patientName: makeName(data === null || data === void 0 ? void 0 : (_data$Encounter27 = data.Encounter) === null || _data$Encounter27 === void 0 ? void 0 : (_data$Encounter27$pat = _data$Encounter27.patient_id) === null || _data$Encounter27$pat === void 0 ? void 0 : (_data$Encounter27$pat2 = _data$Encounter27$pat[0].name) === null || _data$Encounter27$pat2 === void 0 ? void 0 : _data$Encounter27$pat2[0]) || "",
+    patientName: makeName$1(data === null || data === void 0 ? void 0 : (_data$Encounter27 = data.Encounter) === null || _data$Encounter27 === void 0 ? void 0 : (_data$Encounter27$pat = _data$Encounter27.patient_id) === null || _data$Encounter27$pat === void 0 ? void 0 : (_data$Encounter27$pat2 = _data$Encounter27$pat[0].name) === null || _data$Encounter27$pat2 === void 0 ? void 0 : _data$Encounter27$pat2[0]) || "",
     patientAge: (_data$Encounter$patie6 = data === null || data === void 0 ? void 0 : (_data$Encounter28 = data.Encounter) === null || _data$Encounter28 === void 0 ? void 0 : (_data$Encounter28$pat = _data$Encounter28.patient_id) === null || _data$Encounter28$pat === void 0 ? void 0 : (_data$Encounter28$pat2 = _data$Encounter28$pat[0]) === null || _data$Encounter28$pat2 === void 0 ? void 0 : _data$Encounter28$pat2.age) !== null && _data$Encounter$patie6 !== void 0 ? _data$Encounter$patie6 : "",
     patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter29 = data.Encounter) === null || _data$Encounter29 === void 0 ? void 0 : (_data$Encounter29$pat = _data$Encounter29.patient_id) === null || _data$Encounter29$pat === void 0 ? void 0 : (_data$Encounter29$pat2 = _data$Encounter29$pat[0]) === null || _data$Encounter29$pat2 === void 0 ? void 0 : (_data$Encounter29$pat3 = _data$Encounter29$pat2.gender) === null || _data$Encounter29$pat3 === void 0 ? void 0 : (_data$Encounter29$pat4 = _data$Encounter29$pat3.display) === null || _data$Encounter29$pat4 === void 0 ? void 0 : _data$Encounter29$pat4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter30 = data.Encounter) === null || _data$Encounter30 === void 0 ? void 0 : (_data$Encounter30$pat = _data$Encounter30.patient_id) === null || _data$Encounter30$pat === void 0 ? void 0 : (_data$Encounter30$pat2 = _data$Encounter30$pat[0]) === null || _data$Encounter30$pat2 === void 0 ? void 0 : (_data$Encounter30$pat3 = _data$Encounter30$pat2.gender) === null || _data$Encounter30$pat3 === void 0 ? void 0 : (_data$Encounter30$pat4 = _data$Encounter30$pat3.display) === null || _data$Encounter30$pat4 === void 0 ? void 0 : _data$Encounter30$pat4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter31 = data.Encounter) === null || _data$Encounter31 === void 0 ? void 0 : (_data$Encounter31$pat = _data$Encounter31.patient_id) === null || _data$Encounter31$pat === void 0 ? void 0 : (_data$Encounter31$pat2 = _data$Encounter31$pat[0]) === null || _data$Encounter31$pat2 === void 0 ? void 0 : (_data$Encounter31$pat3 = _data$Encounter31$pat2.gender) === null || _data$Encounter31$pat3 === void 0 ? void 0 : (_data$Encounter31$pat4 = _data$Encounter31$pat3.display) === null || _data$Encounter31$pat4 === void 0 ? void 0 : _data$Encounter31$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie7 = data === null || data === void 0 ? void 0 : (_data$Encounter32 = data.Encounter) === null || _data$Encounter32 === void 0 ? void 0 : (_data$Encounter32$pat = _data$Encounter32.patient_id) === null || _data$Encounter32$pat === void 0 ? void 0 : (_data$Encounter32$pat2 = _data$Encounter32$pat[0]) === null || _data$Encounter32$pat2 === void 0 ? void 0 : _data$Encounter32$pat2.MRN) !== null && _data$Encounter$patie7 !== void 0 ? _data$Encounter$patie7 : "",
@@ -22064,7 +22204,7 @@ var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
     practitionerType: // data?.Encounter?.participant?.[0]?.type?.[0]?.display ?? "",
     (_data$Encounter$pract5 = data === null || data === void 0 ? void 0 : (_data$Encounter37 = data.Encounter) === null || _data$Encounter37 === void 0 ? void 0 : (_data$Encounter37$pra = _data$Encounter37.practitioner_details) === null || _data$Encounter37$pra === void 0 ? void 0 : (_data$Encounter37$pra2 = _data$Encounter37$pra[0]) === null || _data$Encounter37$pra2 === void 0 ? void 0 : _data$Encounter37$pra2.type) !== null && _data$Encounter$pract5 !== void 0 ? _data$Encounter$pract5 : "",
     practitionerRole: (_data$Encounter$parti4 = data === null || data === void 0 ? void 0 : (_data$Encounter38 = data.Encounter) === null || _data$Encounter38 === void 0 ? void 0 : (_data$Encounter38$par = _data$Encounter38.participant) === null || _data$Encounter38$par === void 0 ? void 0 : (_data$Encounter38$par2 = _data$Encounter38$par[0]) === null || _data$Encounter38$par2 === void 0 ? void 0 : (_data$Encounter38$par3 = _data$Encounter38$par2.Practitioner_id) === null || _data$Encounter38$par3 === void 0 ? void 0 : (_data$Encounter38$par4 = _data$Encounter38$par3[0]) === null || _data$Encounter38$par4 === void 0 ? void 0 : (_data$Encounter38$par5 = _data$Encounter38$par4.practitioner_role) === null || _data$Encounter38$par5 === void 0 ? void 0 : (_data$Encounter38$par6 = _data$Encounter38$par5[0]) === null || _data$Encounter38$par6 === void 0 ? void 0 : (_data$Encounter38$par7 = _data$Encounter38$par6.role) === null || _data$Encounter38$par7 === void 0 ? void 0 : (_data$Encounter38$par8 = _data$Encounter38$par7[0]) === null || _data$Encounter38$par8 === void 0 ? void 0 : (_data$Encounter38$par9 = _data$Encounter38$par8.coding) === null || _data$Encounter38$par9 === void 0 ? void 0 : (_data$Encounter38$par10 = _data$Encounter38$par9[0]) === null || _data$Encounter38$par10 === void 0 ? void 0 : _data$Encounter38$par10.display) !== null && _data$Encounter$parti4 !== void 0 ? _data$Encounter$parti4 : "",
-    practitioner: makeName(data === null || data === void 0 ? void 0 : (_data$Encounter39 = data.Encounter) === null || _data$Encounter39 === void 0 ? void 0 : (_data$Encounter39$par = _data$Encounter39.participant) === null || _data$Encounter39$par === void 0 ? void 0 : (_data$Encounter39$par2 = _data$Encounter39$par[0]) === null || _data$Encounter39$par2 === void 0 ? void 0 : (_data$Encounter39$par3 = _data$Encounter39$par2.Practitioner_id) === null || _data$Encounter39$par3 === void 0 ? void 0 : (_data$Encounter39$par4 = _data$Encounter39$par3[0]) === null || _data$Encounter39$par4 === void 0 ? void 0 : (_data$Encounter39$par5 = _data$Encounter39$par4.name) === null || _data$Encounter39$par5 === void 0 ? void 0 : _data$Encounter39$par5[0]) || "",
+    practitioner: makeName$1(data === null || data === void 0 ? void 0 : (_data$Encounter39 = data.Encounter) === null || _data$Encounter39 === void 0 ? void 0 : (_data$Encounter39$par = _data$Encounter39.participant) === null || _data$Encounter39$par === void 0 ? void 0 : (_data$Encounter39$par2 = _data$Encounter39$par[0]) === null || _data$Encounter39$par2 === void 0 ? void 0 : (_data$Encounter39$par3 = _data$Encounter39$par2.Practitioner_id) === null || _data$Encounter39$par3 === void 0 ? void 0 : (_data$Encounter39$par4 = _data$Encounter39$par3[0]) === null || _data$Encounter39$par4 === void 0 ? void 0 : (_data$Encounter39$par5 = _data$Encounter39$par4.name) === null || _data$Encounter39$par5 === void 0 ? void 0 : _data$Encounter39$par5[0]) || "",
     //FOR ASSIGN QUERY
     practroleId: (_data$Encounter$parti5 = data === null || data === void 0 ? void 0 : (_data$Encounter40 = data.Encounter) === null || _data$Encounter40 === void 0 ? void 0 : (_data$Encounter40$par = _data$Encounter40.participant) === null || _data$Encounter40$par === void 0 ? void 0 : (_data$Encounter40$par2 = _data$Encounter40$par[0]) === null || _data$Encounter40$par2 === void 0 ? void 0 : (_data$Encounter40$par3 = _data$Encounter40$par2.Practitioner_id) === null || _data$Encounter40$par3 === void 0 ? void 0 : (_data$Encounter40$par4 = _data$Encounter40$par3[0]) === null || _data$Encounter40$par4 === void 0 ? void 0 : (_data$Encounter40$par5 = _data$Encounter40$par4.practitioner_role) === null || _data$Encounter40$par5 === void 0 ? void 0 : (_data$Encounter40$par6 = _data$Encounter40$par5[0]) === null || _data$Encounter40$par6 === void 0 ? void 0 : _data$Encounter40$par6._id) !== null && _data$Encounter$parti5 !== void 0 ? _data$Encounter$parti5 : "",
     practitionerId: (_data$Encounter$parti6 = data === null || data === void 0 ? void 0 : (_data$Encounter41 = data.Encounter) === null || _data$Encounter41 === void 0 ? void 0 : (_data$Encounter41$par = _data$Encounter41.participant) === null || _data$Encounter41$par === void 0 ? void 0 : (_data$Encounter41$par2 = _data$Encounter41$par[0]) === null || _data$Encounter41$par2 === void 0 ? void 0 : (_data$Encounter41$par3 = _data$Encounter41$par2.Practitioner_id) === null || _data$Encounter41$par3 === void 0 ? void 0 : _data$Encounter41$par3[0]._id) !== null && _data$Encounter$parti6 !== void 0 ? _data$Encounter$parti6 : "",
@@ -22090,7 +22230,7 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     //PATIENT DEATAIL
     patientPhoto: (_data$patient_id$0$ph = data === null || data === void 0 ? void 0 : (_data$patient_id = data.patient_id) === null || _data$patient_id === void 0 ? void 0 : (_data$patient_id$ = _data$patient_id[0]) === null || _data$patient_id$ === void 0 ? void 0 : (_data$patient_id$$pho = _data$patient_id$.photo) === null || _data$patient_id$$pho === void 0 ? void 0 : _data$patient_id$$pho[0]) !== null && _data$patient_id$0$ph !== void 0 ? _data$patient_id$0$ph : "",
     // need to expand
-    patientName: makeName(data === null || data === void 0 ? void 0 : (_data$patient_id2 = data.patient_id) === null || _data$patient_id2 === void 0 ? void 0 : (_data$patient_id2$0$n = _data$patient_id2[0].name) === null || _data$patient_id2$0$n === void 0 ? void 0 : _data$patient_id2$0$n[0]) || "",
+    patientName: makeName$1(data === null || data === void 0 ? void 0 : (_data$patient_id2 = data.patient_id) === null || _data$patient_id2 === void 0 ? void 0 : (_data$patient_id2$0$n = _data$patient_id2[0].name) === null || _data$patient_id2$0$n === void 0 ? void 0 : _data$patient_id2$0$n[0]) || "",
     patientAge: (_data$patient_id$0$ag = data === null || data === void 0 ? void 0 : (_data$patient_id3 = data.patient_id) === null || _data$patient_id3 === void 0 ? void 0 : (_data$patient_id3$ = _data$patient_id3[0]) === null || _data$patient_id3$ === void 0 ? void 0 : _data$patient_id3$.age) !== null && _data$patient_id$0$ag !== void 0 ? _data$patient_id$0$ag : "",
     patientGender: (data === null || data === void 0 ? void 0 : (_data$patient_id4 = data.patient_id) === null || _data$patient_id4 === void 0 ? void 0 : (_data$patient_id4$ = _data$patient_id4[0]) === null || _data$patient_id4$ === void 0 ? void 0 : (_data$patient_id4$$ge = _data$patient_id4$.gender) === null || _data$patient_id4$$ge === void 0 ? void 0 : (_data$patient_id4$$ge2 = _data$patient_id4$$ge.display) === null || _data$patient_id4$$ge2 === void 0 ? void 0 : _data$patient_id4$$ge2.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$patient_id5 = data.patient_id) === null || _data$patient_id5 === void 0 ? void 0 : (_data$patient_id5$ = _data$patient_id5[0]) === null || _data$patient_id5$ === void 0 ? void 0 : (_data$patient_id5$$ge = _data$patient_id5$.gender) === null || _data$patient_id5$$ge === void 0 ? void 0 : (_data$patient_id5$$ge2 = _data$patient_id5$$ge.display) === null || _data$patient_id5$$ge2 === void 0 ? void 0 : _data$patient_id5$$ge2.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$patient_id6 = data.patient_id) === null || _data$patient_id6 === void 0 ? void 0 : (_data$patient_id6$ = _data$patient_id6[0]) === null || _data$patient_id6$ === void 0 ? void 0 : (_data$patient_id6$$ge = _data$patient_id6$.gender) === null || _data$patient_id6$$ge === void 0 ? void 0 : (_data$patient_id6$$ge2 = _data$patient_id6$$ge.display) === null || _data$patient_id6$$ge2 === void 0 ? void 0 : _data$patient_id6$$ge2.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$patient_id$0$al = data === null || data === void 0 ? void 0 : (_data$patient_id7 = data.patient_id) === null || _data$patient_id7 === void 0 ? void 0 : (_data$patient_id7$ = _data$patient_id7[0]) === null || _data$patient_id7$ === void 0 ? void 0 : _data$patient_id7$.alias) !== null && _data$patient_id$0$al !== void 0 ? _data$patient_id$0$al : "",
@@ -22304,7 +22444,7 @@ var ASSIGN_PRACTITIONER_LIST = createAsyncThunk("dashboardApiSlice/assignPractit
             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 : "",
+              name: (_makeName = makeName$1(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 : "",
               photo: (_val$photo$ = val === null || val === void 0 ? void 0 : (_val$photo = val.photo) === null || _val$photo === void 0 ? void 0 : _val$photo[0]) !== null && _val$photo$ !== void 0 ? _val$photo$ : "",
               _id: (_val$_id6 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : "",
               _key: (_val$_key = val === null || val === void 0 ? void 0 : val._key) !== null && _val$_key !== void 0 ? _val$_key : "",
@@ -23997,6 +24137,7 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
 
         case 6:
           data = _context12.sent;
+          debugger;
           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$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;
@@ -24005,7 +24146,7 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
               return val.display;
             });
             lang = lang ? lang : null;
-            arr.push({
+            arr.push(_objectSpread2(_objectSpread2({}, val), {}, {
               Organization_id: val.Organization_id,
               id: "EN-" + (val === null || val === void 0 ? void 0 : (_val$_id = val._id) === null || _val$_id === void 0 ? void 0 : (_val$_id$split = _val$_id.split("/")) === null || _val$_id$split === void 0 ? void 0 : _val$_id$split[1]),
               eId: val === null || val === void 0 ? void 0 : val._id,
@@ -24013,7 +24154,7 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
               speciality: ((_val$practitioner_det = val.practitioner_details) === null || _val$practitioner_det === void 0 ? void 0 : (_val$practitioner_det2 = _val$practitioner_det[0]) === null || _val$practitioner_det2 === void 0 ? void 0 : (_val$practitioner_det3 = _val$practitioner_det2.speciality) === null || _val$practitioner_det3 === void 0 ? void 0 : (_val$practitioner_det4 = _val$practitioner_det3.coding) === null || _val$practitioner_det4 === void 0 ? void 0 : (_val$practitioner_det5 = _val$practitioner_det4[0]) === null || _val$practitioner_det5 === void 0 ? void 0 : _val$practitioner_det5.display) || "",
               createdAt: val.createddate,
               // 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]),
+              name: makeName$1(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,
               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,
@@ -24023,26 +24164,26 @@ var GET_ENCOUNTER = createAsyncThunk("chiefCompilenceMastersSlice/encounter", /*
               lang: (_lang = lang) === null || _lang === void 0 ? void 0 : _lang.join(", "),
               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 : ""
-            });
+            }));
           });
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: (_arr$ = arr[0]) !== null && _arr$ !== void 0 ? _arr$ : {}
           }));
 
-        case 12:
-          _context12.prev = 12;
+        case 13:
+          _context12.prev = 13;
           _context12.t0 = _context12["catch"](2);
           alert(_context12.t0.message);
           return _context12.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context12.t0.message
           })));
 
-        case 16:
+        case 17:
         case "end":
           return _context12.stop();
       }
     }
-  }, _callee12, null, [[2, 12]]);
+  }, _callee12, null, [[2, 13]]);
 })));
 var chiefCompilenceMastersSlice = createSlice({
   name: "chiefCompilenceMastersApiSlice",
@@ -24203,7 +24344,8 @@ var queries$9 = {
     return {
       db_name: dbName,
       entity: "Diagnosis",
-      filter: "Diagnosis.icdname LIKE '%".concat(input_text, "%' && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)"),
+      //filter: `Diagnosis.icdname LIKE '%${input_text}%' && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)`,
+      filter: "(like(Diagnosis.icdname,'%".concat(input_text, "%',true) || like(Diagnosis.icdcode,'%").concat(input_text, "%',true)) && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null) && Diagnosis.activestatus==true"),
       return_fields: "{_id:Diagnosis._id,icdcode:Diagnosis.icdcode,icdname:Diagnosis.icdname}",
       sort: "Diagnosis.icdname"
     };
@@ -24471,11 +24613,9 @@ var DIAGNOSIS_MASTERS = createAsyncThunk("DiagnosisMasterSlice/diagnosis", /*#__
           data = _context.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$icdname;
-
             arr.push({
               value: val === null || val === void 0 ? void 0 : val._id,
-              label: (_val$icdname = val === null || val === void 0 ? void 0 : val.icdname) !== null && _val$icdname !== void 0 ? _val$icdname : ""
+              label: (val === null || val === void 0 ? void 0 : val.icdcode) && (val === null || val === void 0 ? void 0 : val.icdname) ? (val === null || val === void 0 ? void 0 : val.icdcode) + " - " + (val === null || val === void 0 ? void 0 : val.icdname) : ""
             });
           });
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -24523,11 +24663,11 @@ var DIAGNOSIS_MASTERS_VALUE = createAsyncThunk("DiagnosisMasterSlice/diagnosis_v
           data = _context2.sent;
           arr = [];
           data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (val) {
-            var _val$icdname2;
+            var _val$icdname;
 
             arr.push({
               value: val === null || val === void 0 ? void 0 : val._id,
-              label: (_val$icdname2 = val === null || val === void 0 ? void 0 : val.icdname) !== null && _val$icdname2 !== void 0 ? _val$icdname2 : ""
+              label: (_val$icdname = val === null || val === void 0 ? void 0 : val.icdname) !== null && _val$icdname !== void 0 ? _val$icdname : ""
             });
           });
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -25649,7 +25789,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$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 _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, _payload$name$nameLab, _payload$name3;
 
   var filter = {};
 
@@ -25742,10 +25882,157 @@ var generateJSON$6 = function generateJSON(payload, orgId) {
       "updatedby": (_payload$updatedby = payload.updatedby) !== null && _payload$updatedby !== void 0 ? _payload$updatedby : "",
       "statushistory": (_payload$statushistor = payload.statushistory) !== null && _payload$statushistor !== void 0 ? _payload$statushistor : [],
       "statusperiod": (_payload$statusperiod = payload.statusperiod) !== null && _payload$statusperiod !== void 0 ? _payload$statusperiod : 0,
-      "components": payload.additiveDetails ? getComponent$1(payload.additiveDetails) : []
+      "components": payload.additiveDetails ? getComponent$1(payload.additiveDetails) : [],
+      //new key
+      "isfirststatorder": false,
+      "SlidingScaleDose": "",
+      "addtictive": [],
+      "id": 0,
+      "orgEntityType": "",
+      "prescriptionType": "",
+      "orderdescription": (_payload$name$nameLab = (_payload$name3 = payload.name) === null || _payload$name3 === void 0 ? void 0 : _payload$name3.nameLabel) !== null && _payload$name$nameLab !== void 0 ? _payload$name$nameLab : "",
+      "ivInfusionTime": 0,
+      "ivInfusionTimeUom": "",
+      "FreqDetls": []
     }
   })];
 };
+var generate_NIFI_JSON = function generate_NIFI_JSON(payload) {
+  var _payload$ORGID, _payload$patientid2, _payload$encountertyp2, _payload$encounterid2, _payload$prescription3, _payload$Prescription2, _payload$name$drugTyp2, _payload$name4, _payload$presNature$v2, _payload$presNature2, _payload$presMode$val2, _payload$presMode2, _payload$priority$val2, _payload$priority2, _payload$status2, _payload$statusreason2, _payload$intent2, _payload$orderPrivile2, _payload$privilegeAle2, _payload$workFlowStat2, _payload$name$value2, _payload$name5, _payload$formCode2, _payload$DefaultRoute3, _payload$DefaultRoute4, _payload$dosageTypeIn2, _payload$unitValue$va2, _payload$unitValue2, _payload$drug_categor3, _payload$drug_categor4, _payload$dispensing_p3, _payload$dispensing_p4, _payload$IVDosageDura3, _payload$IVDosageDura4, _payload$unitsTypes$v2, _payload$unitsTypes2, _payload$ivInfusionRa3, _payload$ivInfusionRa4, _payload$doseOption$v2, _payload$doseOption2, _payload$name$nameLab2, _payload$name6, _payload$orderStartDa, _payload$orderEndDate, _payload$indication$v2, _payload$indication2, _payload$patientInstr4, _payload$patientInstr5, _payload$patientInstr6, _payload$notes2, _payload$parentPresId2, _payload$presGroupRef2, _payload$noofRefillsA2, _payload$initialDispe2, _payload$refillDispen2, _payload$maxRefillDis2, _payload$pendingRefil2, _payload$prescription4, _payload$substitution3, _payload$substitution4, _payload$substituteRe2, _payload$broughtFromH2, _payload$IVIngredient2, _payload$statusperiod2, _payload$unitsTypes$F, _payload$unitsTypes3;
+
+  debugger;
+  return [{
+    "db_name": dbName,
+    "entity": "PH_OrderLine",
+    "is_metadata": true,
+    "metadataId": "04ecb73d-f048-44ce-8563-c9be015812dd",
+    "doc": {
+      "isfirststatorder": false,
+      "SlidingScaleDose": "",
+      "org_Id": (_payload$ORGID = payload === null || payload === void 0 ? void 0 : payload.ORGID) !== null && _payload$ORGID !== void 0 ? _payload$ORGID : "",
+      "addtictive": [],
+      "id": 0,
+      "orgEntityType": "",
+      "patient_Id": (_payload$patientid2 = payload === null || payload === void 0 ? void 0 : payload.patientid) !== null && _payload$patientid2 !== void 0 ? _payload$patientid2 : "",
+      "encountertype": (_payload$encountertyp2 = payload === null || payload === void 0 ? void 0 : payload.encountertype) !== null && _payload$encountertyp2 !== void 0 ? _payload$encountertyp2 : "",
+      "encounter_Id": (_payload$encounterid2 = payload === null || payload === void 0 ? void 0 : payload.encounterid) !== null && _payload$encounterid2 !== void 0 ? _payload$encounterid2 : "",
+      "prescriptionType": "",
+      //"CodingMaster/11035"
+      "prescriptionId": (_payload$prescription3 = payload === null || payload === void 0 ? void 0 : payload.prescriptionId) !== null && _payload$prescription3 !== void 0 ? _payload$prescription3 : "",
+      "PrescriptionDate": (_payload$Prescription2 = payload === null || payload === void 0 ? void 0 : payload.PrescriptionDate) !== null && _payload$Prescription2 !== void 0 ? _payload$Prescription2 : 0,
+      "drugType": (_payload$name$drugTyp2 = payload === null || payload === void 0 ? void 0 : (_payload$name4 = payload.name) === null || _payload$name4 === void 0 ? void 0 : _payload$name4.drugTypeId) !== null && _payload$name$drugTyp2 !== void 0 ? _payload$name$drugTyp2 : "",
+      "presNature": (_payload$presNature$v2 = payload === null || payload === void 0 ? void 0 : (_payload$presNature2 = payload.presNature) === null || _payload$presNature2 === void 0 ? void 0 : _payload$presNature2.value) !== null && _payload$presNature$v2 !== void 0 ? _payload$presNature$v2 : "",
+      "presMode": (_payload$presMode$val2 = payload === null || payload === void 0 ? void 0 : (_payload$presMode2 = payload.presMode) === null || _payload$presMode2 === void 0 ? void 0 : _payload$presMode2.value) !== null && _payload$presMode$val2 !== void 0 ? _payload$presMode$val2 : "",
+      "priority": (_payload$priority$val2 = payload === null || payload === void 0 ? void 0 : (_payload$priority2 = payload.priority) === null || _payload$priority2 === void 0 ? void 0 : _payload$priority2.value) !== null && _payload$priority$val2 !== void 0 ? _payload$priority$val2 : "",
+      "status": (_payload$status2 = payload === null || payload === void 0 ? void 0 : payload.status) !== null && _payload$status2 !== void 0 ? _payload$status2 : "",
+      "statusreason": (_payload$statusreason2 = payload === null || payload === void 0 ? void 0 : payload.statusreason) !== null && _payload$statusreason2 !== void 0 ? _payload$statusreason2 : "",
+      "intent": (_payload$intent2 = payload === null || payload === void 0 ? void 0 : payload.intent) !== null && _payload$intent2 !== void 0 ? _payload$intent2 : "",
+      "orderPrivilegeLevel": (_payload$orderPrivile2 = payload === null || payload === void 0 ? void 0 : payload.orderPrivilegeLevel) !== null && _payload$orderPrivile2 !== void 0 ? _payload$orderPrivile2 : "",
+      "privilegeAlertMessageTxt": (_payload$privilegeAle2 = payload === null || payload === void 0 ? void 0 : payload.privilegeAlertMessageTxt) !== null && _payload$privilegeAle2 !== void 0 ? _payload$privilegeAle2 : "",
+      "workFlowStatus": (_payload$workFlowStat2 = payload === null || payload === void 0 ? void 0 : payload.workFlowStatus) !== null && _payload$workFlowStat2 !== void 0 ? _payload$workFlowStat2 : "",
+      "drugCode": (_payload$name$value2 = payload === null || payload === void 0 ? void 0 : (_payload$name5 = payload.name) === null || _payload$name5 === void 0 ? void 0 : _payload$name5.value) !== null && _payload$name$value2 !== void 0 ? _payload$name$value2 : "",
+      "formCode": (_payload$formCode2 = payload === null || payload === void 0 ? void 0 : payload.formCode) !== null && _payload$formCode2 !== void 0 ? _payload$formCode2 : "",
+      "routeCode": (_payload$DefaultRoute3 = payload === null || payload === void 0 ? void 0 : (_payload$DefaultRoute4 = payload.DefaultRouteCode) === null || _payload$DefaultRoute4 === void 0 ? void 0 : _payload$DefaultRoute4.value) !== null && _payload$DefaultRoute3 !== void 0 ? _payload$DefaultRoute3 : "",
+      "dosageTypeIndicator": (_payload$dosageTypeIn2 = payload === null || payload === void 0 ? void 0 : payload.dosageTypeIndicator) !== null && _payload$dosageTypeIn2 !== void 0 ? _payload$dosageTypeIn2 : "",
+      "dosageValue": (payload === null || payload === void 0 ? void 0 : payload.doseMeasurementValue) ? parseInt(payload === null || payload === void 0 ? void 0 : payload.doseMeasurementValue) : 0,
+      "dosageUOM": (_payload$unitValue$va2 = payload === null || payload === void 0 ? void 0 : (_payload$unitValue2 = payload.unitValue) === null || _payload$unitValue2 === void 0 ? void 0 : _payload$unitValue2.value) !== null && _payload$unitValue$va2 !== void 0 ? _payload$unitValue$va2 : "",
+      "drug_category": (_payload$drug_categor3 = payload === null || payload === void 0 ? void 0 : (_payload$drug_categor4 = payload.drug_category) === null || _payload$drug_categor4 === void 0 ? void 0 : _payload$drug_categor4.value) !== null && _payload$drug_categor3 !== void 0 ? _payload$drug_categor3 : "",
+      "dispensing_pharmacy": (_payload$dispensing_p3 = payload === null || payload === void 0 ? void 0 : (_payload$dispensing_p4 = payload.dispensing_pharmacy) === null || _payload$dispensing_p4 === void 0 ? void 0 : _payload$dispensing_p4.value) !== null && _payload$dispensing_p3 !== void 0 ? _payload$dispensing_p3 : "",
+      "IVDosageDurationValue": (payload === null || payload === void 0 ? void 0 : payload.IVDosageDurationValue) ? parseInt(payload === null || payload === void 0 ? void 0 : payload.IVDosageDurationValue) : 0,
+      "IVDosageDurationUOM": (_payload$IVDosageDura3 = payload === null || payload === void 0 ? void 0 : (_payload$IVDosageDura4 = payload.IVDosageDurationUOM) === null || _payload$IVDosageDura4 === void 0 ? void 0 : _payload$IVDosageDura4.value) !== null && _payload$IVDosageDura3 !== void 0 ? _payload$IVDosageDura3 : "",
+      "dosageFreqCode": (_payload$unitsTypes$v2 = payload === null || payload === void 0 ? void 0 : (_payload$unitsTypes2 = payload.unitsTypes) === null || _payload$unitsTypes2 === void 0 ? void 0 : _payload$unitsTypes2.value) !== null && _payload$unitsTypes$v2 !== void 0 ? _payload$unitsTypes$v2 : "",
+      "ivInfusionRateValue": (payload === null || payload === void 0 ? void 0 : payload.ivInfusionRateValue) ? parseInt(payload === null || payload === void 0 ? void 0 : payload.ivInfusionRateValue) : 0,
+      "ivInfusionRateUOM": (_payload$ivInfusionRa3 = payload === null || payload === void 0 ? void 0 : (_payload$ivInfusionRa4 = payload.ivInfusionRateUOM) === null || _payload$ivInfusionRa4 === void 0 ? void 0 : _payload$ivInfusionRa4.value) !== null && _payload$ivInfusionRa3 !== void 0 ? _payload$ivInfusionRa3 : "",
+      "dosageDurationValue": (payload === null || payload === void 0 ? void 0 : payload.dosetime) ? parseInt(payload === null || payload === void 0 ? void 0 : payload.dosetime) : 0,
+      "dosageDurationUOM": (_payload$doseOption$v2 = payload === null || payload === void 0 ? void 0 : (_payload$doseOption2 = payload.doseOption) === null || _payload$doseOption2 === void 0 ? void 0 : _payload$doseOption2.value) !== null && _payload$doseOption$v2 !== void 0 ? _payload$doseOption$v2 : "",
+      "orderdescription": (_payload$name$nameLab2 = payload === null || payload === void 0 ? void 0 : (_payload$name6 = payload.name) === null || _payload$name6 === void 0 ? void 0 : _payload$name6.nameLabel) !== null && _payload$name$nameLab2 !== void 0 ? _payload$name$nameLab2 : "",
+      "ivInfusionTime": 0,
+      "ivInfusionTimeUom": "",
+      "useAsSlidingScaleDose": [],
+      "occurStartDateTime": (_payload$orderStartDa = payload === null || payload === void 0 ? void 0 : payload.orderStartDate) !== null && _payload$orderStartDa !== void 0 ? _payload$orderStartDa : 0,
+      "occurEndDateTime": (_payload$orderEndDate = payload === null || payload === void 0 ? void 0 : payload.orderEndDate) !== null && _payload$orderEndDate !== void 0 ? _payload$orderEndDate : 0,
+      "totPresQty": 0,
+      "totPresQtyUOM": "",
+      "totDispQty": 0,
+      "totDispQtyUOM": "",
+      "totBilledQty": 0,
+      "totBilledQtyUOM": "",
+      "totReturnedQty": 0,
+      "PRNYN": false,
+      "prnComment": "",
+      "direction": "",
+      "diagnosis": [],
+      "reasonCode": "",
+      "indication": (_payload$indication$v2 = payload === null || payload === void 0 ? void 0 : (_payload$indication2 = payload.indication) === null || _payload$indication2 === void 0 ? void 0 : _payload$indication2.value) !== null && _payload$indication$v2 !== void 0 ? _payload$indication$v2 : "",
+      //"CodingMaster/10794",
+      "patientInstruction": (_payload$patientInstr4 = payload === null || payload === void 0 ? void 0 : (_payload$patientInstr5 = payload.patientInstruction) === null || _payload$patientInstr5 === void 0 ? void 0 : _payload$patientInstr5.value) !== null && _payload$patientInstr4 !== void 0 ? _payload$patientInstr4 : "",
+      //"CodingMaster/10700"
+      "patientInstructiondesc": (_payload$patientInstr6 = payload === null || payload === void 0 ? void 0 : payload.patientInstructiondesc) !== null && _payload$patientInstr6 !== void 0 ? _payload$patientInstr6 : "",
+      "notes": (_payload$notes2 = payload === null || payload === void 0 ? void 0 : payload.notes) !== null && _payload$notes2 !== void 0 ? _payload$notes2 : "",
+      "parentPresId": (_payload$parentPresId2 = payload === null || payload === void 0 ? void 0 : payload.parentPresId) !== null && _payload$parentPresId2 !== void 0 ? _payload$parentPresId2 : "",
+      "presGroupRefId": (_payload$presGroupRef2 = payload === null || payload === void 0 ? void 0 : payload.presGroupRefId) !== null && _payload$presGroupRef2 !== void 0 ? _payload$presGroupRef2 : "",
+      "requestor": (payload === null || payload === void 0 ? void 0 : payload.requestor) ? getrequestor$1(payload === null || payload === void 0 ? void 0 : payload.requestor) : [],
+      "performer": (payload === null || payload === void 0 ? void 0 : payload.performer) ? getPerformer$1(payload === null || payload === void 0 ? void 0 : payload.performer) : [],
+      "noofRefillsAllowed": (_payload$noofRefillsA2 = payload === null || payload === void 0 ? void 0 : payload.noofRefillsAllowed) !== null && _payload$noofRefillsA2 !== void 0 ? _payload$noofRefillsA2 : 0,
+      "initialDispenseDurn": (_payload$initialDispe2 = payload === null || payload === void 0 ? void 0 : payload.initialDispenseDurn) !== null && _payload$initialDispe2 !== void 0 ? _payload$initialDispe2 : 0,
+      "refillDispenseIntervalDays": (_payload$refillDispen2 = payload === null || payload === void 0 ? void 0 : payload.refillDispenseIntervalDays) !== null && _payload$refillDispen2 !== void 0 ? _payload$refillDispen2 : 0,
+      "maxRefillDispenseDurn": (_payload$maxRefillDis2 = payload === null || payload === void 0 ? void 0 : payload.maxRefillDispenseDurn) !== null && _payload$maxRefillDis2 !== void 0 ? _payload$maxRefillDis2 : 0,
+      "pendingRefillCount": (_payload$pendingRefil2 = payload === null || payload === void 0 ? void 0 : payload.pendingRefillCount) !== null && _payload$pendingRefil2 !== void 0 ? _payload$pendingRefil2 : "",
+      "prescriptionValidityPeriodDays": (_payload$prescription4 = payload === null || payload === void 0 ? void 0 : payload.prescriptionValidityPeriodDays) !== null && _payload$prescription4 !== void 0 ? _payload$prescription4 : 0,
+      "substitutionAllowed": (_payload$substitution3 = payload === null || payload === void 0 ? void 0 : payload.substitutionAllowed) !== null && _payload$substitution3 !== void 0 ? _payload$substitution3 : false,
+      "substitutionAllowedTypes": (_payload$substitution4 = payload === null || payload === void 0 ? void 0 : payload.substitutionAllowedTypes) !== null && _payload$substitution4 !== void 0 ? _payload$substitution4 : "",
+      "substituteReasonCode": (_payload$substituteRe2 = payload === null || payload === void 0 ? void 0 : payload.substituteReasonCode) !== null && _payload$substituteRe2 !== void 0 ? _payload$substituteRe2 : "",
+      "broughtFromHome": (_payload$broughtFromH2 = payload === null || payload === void 0 ? void 0 : payload.broughtFromHome) !== null && _payload$broughtFromH2 !== void 0 ? _payload$broughtFromH2 : false,
+      "IVIngredientDescription": (_payload$IVIngredient2 = payload === null || payload === void 0 ? void 0 : payload.IVIngredientDescription) !== null && _payload$IVIngredient2 !== void 0 ? _payload$IVIngredient2 : "",
+      "statushistory": [],
+      "statusperiod": (_payload$statusperiod2 = payload === null || payload === void 0 ? void 0 : payload.statusperiod) !== null && _payload$statusperiod2 !== void 0 ? _payload$statusperiod2 : 0,
+      "components": (payload === null || payload === void 0 ? void 0 : payload.additiveDetails) ? getComponent$1(payload === null || payload === void 0 ? void 0 : payload.additiveDetails) : [],
+      // "FreqDetls": [
+      //     {
+      //         "remarks": "Morning",
+      //         "dose": "",
+      //         "time": "08:00",
+      //         "baseFreq": "",
+      //         "weekDay": "",
+      //         "day": 0,
+      //         "fromDay": 0,
+      //         "toDay": 0,
+      //         "fromDate": 0,
+      //         "toDate": 0,
+      //         "adminDosageInstruction": ""
+      //     },
+      //     {
+      //         "remarks": "Noon",
+      //         "dose": "",
+      //         "time": "12:00",
+      //         "baseFreq": "",
+      //         "weekDay": "",
+      //         "day": 0,
+      //         "fromDay": 0,
+      //         "toDay": 0,
+      //         "fromDate": 0,
+      //         "toDate": 0,
+      //         "adminDosageInstruction": ""
+      //     },
+      //     {
+      //         "remarks": "Night",
+      //         "dose": "",
+      //         "time": "20:00",
+      //         "baseFreq": "",
+      //         "weekDay": "",
+      //         "day": 0,
+      //         "fromDay": 0,
+      //         "toDay": 0,
+      //         "fromDate": 0,
+      //         "toDate": 0,
+      //         "adminDosageInstruction": ""
+      //     }
+      // ],
+      "FreqDetls": (_payload$unitsTypes$F = payload === null || payload === void 0 ? void 0 : (_payload$unitsTypes3 = payload.unitsTypes) === null || _payload$unitsTypes3 === void 0 ? void 0 : _payload$unitsTypes3.FreqDetls) !== null && _payload$unitsTypes$F !== void 0 ? _payload$unitsTypes$F : [],
+      "nextrefilldate": 0
+    }
+  }];
+};
 
 var getuseAsSlidingScaleDose$1 = function getuseAsSlidingScaleDose(list) {
   var arr = [];
@@ -29693,7 +29980,7 @@ var generateResJson$3 = function generateResJson(dataList, arr) {
         orderBy: {
           value: (_val$Requestor$0$prac6 = 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) !== null && _val$Requestor$0$prac6 !== void 0 ? _val$Requestor$0$prac6 : "",
           practitioner_id: (_val$Requestor$0$prac7 = 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) !== null && _val$Requestor$0$prac7 !== void 0 ? _val$Requestor$0$prac7 : "",
-          label: (_makeName = 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]) || {})) !== null && _makeName !== void 0 ? _makeName : ""
+          label: (_makeName = makeName$1((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]) || {})) !== null && _makeName !== void 0 ? _makeName : ""
         }
       },
       indication: {
@@ -29868,7 +30155,7 @@ var RecurrentgenerateResJson$2 = function RecurrentgenerateResJson(dataList, arr
         orderBy: {
           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]) || {})
+          label: makeName$1((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: {
@@ -31364,7 +31651,7 @@ var ORDER_TYPE_REQ_DETAILS_LAB = createAsyncThunk("LabOrderApiSlice/order_type_r
             // 	val.name[0]?.suffix[0]?.coding.display
             // ) {
             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]) || {}),
+              label: makeName$1((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 : "",
               practitioner_id: (_val$practitioner_id = val === null || val === void 0 ? void 0 : val.practitioner_id) !== null && _val$practitioner_id !== void 0 ? _val$practitioner_id : ""
             }); // }
@@ -32148,8 +32435,9 @@ var queries$5 = {
   //       "return_fields": "MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})"
   //   }`,
   drugMaster: function drugMaster(input_text) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"filter\":\"(like(DrugMaster.ShortDesc,'%").concat(input_text, "%',true) || like(DrugMaster.LongDesc,'%").concat(input_text, "%',true) || like(DrugMaster.DrugCode,'%").concat(input_text, "%',true)) && DrugMaster.activestatus==true\",\n        \"limit\":{\n          \"count\":100,\n          \"offset\":0\n        },\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})\"\n    }");
+    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"filter\":\"(like(DrugMaster.ShortDesc,'%").concat(input_text, "%',true) || like(DrugMaster.LongDesc,'%").concat(input_text, "%',true) || like(DrugMaster.DrugCode,'%").concat(input_text, "%',true)) && DrugMaster.activestatus==true\",\n        \"limit\":{\n          \"count\":100,\n          \"offset\":0\n        },\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode),FrequencyRules:(for freq in TO_ARRAY(DrugMaster.FrequencyRules) return merge(document(freq),{freqcode:merge(document(document(freq).freqcode),{scheduleline:document(document(document(freq).freqcode).scheduleline)}),doseUOM:document(document(freq).doseUOM),durnUOM:document(document(freq).durnUOM),InfuseRateUom:document(document(freq).InfuseRateUom),InfuseOverDurType:document(document(freq).InfuseOverDurType)}))})\"\n    }");
   },
+  // "return_fields": "MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})"
   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    }");
   },
@@ -32166,7 +32454,7 @@ var queries$5 = {
   DosageVolumeUom: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugUOM\",\n        \"filter\":\"DrugUOM.IsDosageStrengthUOM==true\",\n        \"return_fields\": \"DrugUOM\"\n    }"),
   DrugRoutes: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugRoutes\",\n        \"filter\": \"DrugRoutes.status==true\",\n        \"return_fields\": \"DrugRoutes\"\n    }"),
   DosageForm: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DosageForm\",\n        \"return_fields\": \"DosageForm\"\n    }"),
-  FrequencyMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"FrequencyMaster\",\n        \"filter\": \"FrequencyMaster.status==true\",\n        \"return_fields\": \"FrequencyMaster\"\n    }"),
+  FrequencyMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"FrequencyMaster\",\n        \"filter\": \"FrequencyMaster.status==true\",\n        \"return_fields\": \"merge(FrequencyMaster, {fixeddurUOM: document(FrequencyMaster.fixeddurUOM)}, {scheduleline:(for freq in FrequencySchedule filter freq._id in FrequencyMaster.scheduleline return merge(freq,{basefreq:document(freq.basefreq)},{day:document(freq.day)}))},{frequencytype:document(FrequencyMaster.frequencytype)})\"\n    }"),
   DurationType: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugUOM\",\n        \"filter\":\"LOWER(DOCUMENT(DrugUOM.UOMType).display) =='time' and DrugUOM.activestatus==true and DrugUOM.status==true\",\n        \"return_fields\": \"DrugUOM\"\n    }"),
   // Priority: `{
   //       "db_name": "${dbName}",
@@ -32342,7 +32630,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, _val$DrugCategory, _val$DefaultRouteCode;
+            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, _val$FrequencyRules$, _val$FrequencyRules, _val$FrequencyRules$2, _val$FrequencyRules$3, _val$FrequencyRules2, _val$FrequencyRules2$, _val$FrequencyRules3, _val$FrequencyRules3$, _val$FrequencyRules3$2, _val$FrequencyRules4, _val$FrequencyRules4$, _val$FrequencyRules4$2, _val$FrequencyRules5, _val$FrequencyRules5$, _val$FrequencyRules5$2, _val$FrequencyRules6, _val$FrequencyRules6$, _val$FrequencyRules6$2, _val$FrequencyRules7, _val$FrequencyRules7$, _val$FrequencyRules7$2, _val$FrequencyRules8, _val$FrequencyRules8$, _val$FrequencyRules8$2, _val$FrequencyRules9, _val$FrequencyRules9$, _val$FrequencyRules9$2, _val$FrequencyRules10, _val$FrequencyRules11, _val$FrequencyRules12, _val$FrequencyRules13, _val$FrequencyRules14, _val$FrequencyRules15, _val$FrequencyRules16, _val$FrequencyRules17, _val$FrequencyRules18, _val$FrequencyRules19, _val$FrequencyRules20, _val$FrequencyRules21, _val$FrequencyRules22, _val$FrequencyRules23, _val$FrequencyRules24, _val$FrequencyRules25, _val$FrequencyRules26, _val$FrequencyRules27, _val$FrequencyRules28, _val$FrequencyRules29, _val$FrequencyRules30, _val$FrequencyRules31, _val$FrequencyRules32, _val$FrequencyRules33, _val$FrequencyRules$4, _val$FrequencyRules34, _val$FrequencyRules35, _val$FrequencyRules36, _val$FrequencyRules37, _val$FrequencyRules38, _val$FrequencyRules39, _val$FrequencyRules$5, _val$FrequencyRules40, _val$FrequencyRules41, _val$FrequencyRules42, _val$FrequencyRules43, _val$FrequencyRules44, _val$FrequencyRules45;
 
             var json = {
               value: val === null || val === void 0 ? void 0 : val._id,
@@ -32359,15 +32647,47 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
               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,
               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
+              DefaultRouteCode: (_val$DefaultRouteCode = val === null || val === void 0 ? void 0 : val.DefaultRouteCode) !== null && _val$DefaultRouteCode !== void 0 ? _val$DefaultRouteCode : "",
+              //new values
+              doseVal: (_val$FrequencyRules$ = val === null || val === void 0 ? void 0 : (_val$FrequencyRules = val.FrequencyRules) === null || _val$FrequencyRules === void 0 ? void 0 : (_val$FrequencyRules$2 = _val$FrequencyRules[0]) === null || _val$FrequencyRules$2 === void 0 ? void 0 : _val$FrequencyRules$2.doseval) !== null && _val$FrequencyRules$ !== void 0 ? _val$FrequencyRules$ : "",
+              durationcode: (_val$FrequencyRules$3 = val === null || val === void 0 ? void 0 : (_val$FrequencyRules2 = val.FrequencyRules) === null || _val$FrequencyRules2 === void 0 ? void 0 : (_val$FrequencyRules2$ = _val$FrequencyRules2[0]) === null || _val$FrequencyRules2$ === void 0 ? void 0 : _val$FrequencyRules2$.durationcode) !== null && _val$FrequencyRules$3 !== void 0 ? _val$FrequencyRules$3 : "",
+              doseUOM: {
+                id: val === null || val === void 0 ? void 0 : (_val$FrequencyRules3 = val.FrequencyRules) === null || _val$FrequencyRules3 === void 0 ? void 0 : (_val$FrequencyRules3$ = _val$FrequencyRules3[0]) === null || _val$FrequencyRules3$ === void 0 ? void 0 : (_val$FrequencyRules3$2 = _val$FrequencyRules3$.doseUOM) === null || _val$FrequencyRules3$2 === void 0 ? void 0 : _val$FrequencyRules3$2._key,
+                label: (val === null || val === void 0 ? void 0 : (_val$FrequencyRules4 = val.FrequencyRules) === null || _val$FrequencyRules4 === void 0 ? void 0 : (_val$FrequencyRules4$ = _val$FrequencyRules4[0]) === null || _val$FrequencyRules4$ === void 0 ? void 0 : (_val$FrequencyRules4$2 = _val$FrequencyRules4$.doseUOM) === null || _val$FrequencyRules4$2 === void 0 ? void 0 : _val$FrequencyRules4$2.UOM) && (val === null || val === void 0 ? void 0 : (_val$FrequencyRules5 = val.FrequencyRules) === null || _val$FrequencyRules5 === void 0 ? void 0 : (_val$FrequencyRules5$ = _val$FrequencyRules5[0]) === null || _val$FrequencyRules5$ === void 0 ? void 0 : (_val$FrequencyRules5$2 = _val$FrequencyRules5$.doseUOM) === null || _val$FrequencyRules5$2 === void 0 ? void 0 : _val$FrequencyRules5$2.shortdesc) ? (val === null || val === void 0 ? void 0 : (_val$FrequencyRules6 = val.FrequencyRules) === null || _val$FrequencyRules6 === void 0 ? void 0 : (_val$FrequencyRules6$ = _val$FrequencyRules6[0]) === null || _val$FrequencyRules6$ === void 0 ? void 0 : (_val$FrequencyRules6$2 = _val$FrequencyRules6$.doseUOM) === null || _val$FrequencyRules6$2 === void 0 ? void 0 : _val$FrequencyRules6$2.UOM) + " - " + (val === null || val === void 0 ? void 0 : (_val$FrequencyRules7 = val.FrequencyRules) === null || _val$FrequencyRules7 === void 0 ? void 0 : (_val$FrequencyRules7$ = _val$FrequencyRules7[0]) === null || _val$FrequencyRules7$ === void 0 ? void 0 : (_val$FrequencyRules7$2 = _val$FrequencyRules7$.doseUOM) === null || _val$FrequencyRules7$2 === void 0 ? void 0 : _val$FrequencyRules7$2.shortdesc) : "",
+                value: val === null || val === void 0 ? void 0 : (_val$FrequencyRules8 = val.FrequencyRules) === null || _val$FrequencyRules8 === void 0 ? void 0 : (_val$FrequencyRules8$ = _val$FrequencyRules8[0]) === null || _val$FrequencyRules8$ === void 0 ? void 0 : (_val$FrequencyRules8$2 = _val$FrequencyRules8$.doseUOM) === null || _val$FrequencyRules8$2 === void 0 ? void 0 : _val$FrequencyRules8$2._id
+              },
+              freqCode: {
+                id: val === null || val === void 0 ? void 0 : (_val$FrequencyRules9 = val.FrequencyRules) === null || _val$FrequencyRules9 === void 0 ? void 0 : (_val$FrequencyRules9$ = _val$FrequencyRules9[0]) === null || _val$FrequencyRules9$ === void 0 ? void 0 : (_val$FrequencyRules9$2 = _val$FrequencyRules9$.freqcode) === null || _val$FrequencyRules9$2 === void 0 ? void 0 : _val$FrequencyRules9$2._key,
+                label: (val === null || val === void 0 ? void 0 : (_val$FrequencyRules10 = val.FrequencyRules) === null || _val$FrequencyRules10 === void 0 ? void 0 : (_val$FrequencyRules11 = _val$FrequencyRules10[0]) === null || _val$FrequencyRules11 === void 0 ? void 0 : (_val$FrequencyRules12 = _val$FrequencyRules11.freqcode) === null || _val$FrequencyRules12 === void 0 ? void 0 : _val$FrequencyRules12.freqcode) && (val === null || val === void 0 ? void 0 : (_val$FrequencyRules13 = val.FrequencyRules) === null || _val$FrequencyRules13 === void 0 ? void 0 : (_val$FrequencyRules14 = _val$FrequencyRules13[0]) === null || _val$FrequencyRules14 === void 0 ? void 0 : (_val$FrequencyRules15 = _val$FrequencyRules14.freqcode) === null || _val$FrequencyRules15 === void 0 ? void 0 : _val$FrequencyRules15.shortdesc) ? (val === null || val === void 0 ? void 0 : (_val$FrequencyRules16 = val.FrequencyRules) === null || _val$FrequencyRules16 === void 0 ? void 0 : (_val$FrequencyRules17 = _val$FrequencyRules16[0]) === null || _val$FrequencyRules17 === void 0 ? void 0 : (_val$FrequencyRules18 = _val$FrequencyRules17.freqcode) === null || _val$FrequencyRules18 === void 0 ? void 0 : _val$FrequencyRules18.freqcode) + " - " + (val === null || val === void 0 ? void 0 : (_val$FrequencyRules19 = val.FrequencyRules) === null || _val$FrequencyRules19 === void 0 ? void 0 : (_val$FrequencyRules20 = _val$FrequencyRules19[0]) === null || _val$FrequencyRules20 === void 0 ? void 0 : (_val$FrequencyRules21 = _val$FrequencyRules20.freqcode) === null || _val$FrequencyRules21 === void 0 ? void 0 : _val$FrequencyRules21.shortdesc) : "",
+                value: val === null || val === void 0 ? void 0 : (_val$FrequencyRules22 = val.FrequencyRules) === null || _val$FrequencyRules22 === void 0 ? void 0 : (_val$FrequencyRules23 = _val$FrequencyRules22[0]) === null || _val$FrequencyRules23 === void 0 ? void 0 : (_val$FrequencyRules24 = _val$FrequencyRules23.freqcode) === null || _val$FrequencyRules24 === void 0 ? void 0 : _val$FrequencyRules24._id,
+                freqCode: val === null || val === void 0 ? void 0 : (_val$FrequencyRules25 = val.FrequencyRules) === null || _val$FrequencyRules25 === void 0 ? void 0 : (_val$FrequencyRules26 = _val$FrequencyRules25[0]) === null || _val$FrequencyRules26 === void 0 ? void 0 : (_val$FrequencyRules27 = _val$FrequencyRules26.freqcode) === null || _val$FrequencyRules27 === void 0 ? void 0 : _val$FrequencyRules27.freqcode,
+                FreqDetls: Array.isArray(val === null || val === void 0 ? void 0 : (_val$FrequencyRules28 = val.FrequencyRules) === null || _val$FrequencyRules28 === void 0 ? void 0 : (_val$FrequencyRules29 = _val$FrequencyRules28[0]) === null || _val$FrequencyRules29 === void 0 ? void 0 : (_val$FrequencyRules30 = _val$FrequencyRules29.freqcode) === null || _val$FrequencyRules30 === void 0 ? void 0 : _val$FrequencyRules30.scheduleline) && (val === null || val === void 0 ? void 0 : (_val$FrequencyRules31 = val.FrequencyRules) === null || _val$FrequencyRules31 === void 0 ? void 0 : (_val$FrequencyRules32 = _val$FrequencyRules31[0]) === null || _val$FrequencyRules32 === void 0 ? void 0 : (_val$FrequencyRules33 = _val$FrequencyRules32.freqcode) === null || _val$FrequencyRules33 === void 0 ? void 0 : _val$FrequencyRules33.scheduleline.length) > 0 ? constructFreqDetls((_val$FrequencyRules$4 = val === null || val === void 0 ? void 0 : (_val$FrequencyRules34 = val.FrequencyRules) === null || _val$FrequencyRules34 === void 0 ? void 0 : (_val$FrequencyRules35 = _val$FrequencyRules34[0]) === null || _val$FrequencyRules35 === void 0 ? void 0 : (_val$FrequencyRules36 = _val$FrequencyRules35.freqcode) === null || _val$FrequencyRules36 === void 0 ? void 0 : _val$FrequencyRules36.scheduleline) !== null && _val$FrequencyRules$4 !== void 0 ? _val$FrequencyRules$4 : []) : []
+              },
+              durationCode: {
+                id: val === null || val === void 0 ? void 0 : (_val$FrequencyRules37 = val.FrequencyRules) === null || _val$FrequencyRules37 === void 0 ? void 0 : (_val$FrequencyRules38 = _val$FrequencyRules37[0]) === null || _val$FrequencyRules38 === void 0 ? void 0 : (_val$FrequencyRules39 = _val$FrequencyRules38.durnUOM) === null || _val$FrequencyRules39 === void 0 ? void 0 : _val$FrequencyRules39._key,
+                label: (_val$FrequencyRules$5 = val === null || val === void 0 ? void 0 : (_val$FrequencyRules40 = val.FrequencyRules) === null || _val$FrequencyRules40 === void 0 ? void 0 : (_val$FrequencyRules41 = _val$FrequencyRules40[0]) === null || _val$FrequencyRules41 === void 0 ? void 0 : (_val$FrequencyRules42 = _val$FrequencyRules41.durnUOM) === null || _val$FrequencyRules42 === void 0 ? void 0 : _val$FrequencyRules42.shortdesc) !== null && _val$FrequencyRules$5 !== void 0 ? _val$FrequencyRules$5 : "",
+                value: val === null || val === void 0 ? void 0 : (_val$FrequencyRules43 = val.FrequencyRules) === null || _val$FrequencyRules43 === void 0 ? void 0 : (_val$FrequencyRules44 = _val$FrequencyRules43[0]) === null || _val$FrequencyRules44 === void 0 ? void 0 : (_val$FrequencyRules45 = _val$FrequencyRules44.durnUOM) === null || _val$FrequencyRules45 === void 0 ? void 0 : _val$FrequencyRules45._id
+              } // formValue
 
             };
-            arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
-              name: val === null || val === void 0 ? void 0 : val.ShortDesc,
-              label: (val === null || val === void 0 ? void 0 : val.DrugCode) + " - " + (val === null || val === void 0 ? void 0 : val.ShortDesc) + " - " + (val === null || val === void 0 ? void 0 : val.LongDesc) // label: val?.ShortDesc
-              // label: `${val.ShortDesc ?? ""} - ${json.StrengthValues} ${json.StrengthUOM}`,
 
-            }));
+            if ((val === null || val === void 0 ? void 0 : val.ShortDesc) === (val === null || val === void 0 ? void 0 : val.LongDesc)) {
+              arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
+                name: val === null || val === void 0 ? void 0 : val.ShortDesc,
+                label: (val === null || val === void 0 ? void 0 : val.DrugCode) + " - " + (val === null || val === void 0 ? void 0 : val.ShortDesc),
+                nameLabel: val === null || val === void 0 ? void 0 : val.ShortDesc // label: val?.ShortDesc
+                // label: `${val.ShortDesc ?? ""} - ${json.StrengthValues} ${json.StrengthUOM}`,
+
+              }));
+            } else {
+              arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
+                name: val === null || val === void 0 ? void 0 : val.ShortDesc,
+                label: (val === null || val === void 0 ? void 0 : val.DrugCode) + " - " + (val === null || val === void 0 ? void 0 : val.ShortDesc) + " - " + (val === null || val === void 0 ? void 0 : val.LongDesc),
+                nameLabel: val === null || val === void 0 ? void 0 : val.ShortDesc // label: val?.ShortDesc
+                // label: `${val.ShortDesc ?? ""} - ${json.StrengthValues} ${json.StrengthUOM}`,
+
+              }));
+            }
           });
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: arr
@@ -32463,12 +32783,10 @@ var STRENGTHUOM_MASTER = createAsyncThunk("MedicationMastersSlice/strengthUom_ma
           data = _context4.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$UOM;
-
             arr.push({
-              value: val._id,
-              label: (_val$UOM = val.UOM) !== null && _val$UOM !== void 0 ? _val$UOM : "",
-              id: val.id
+              value: val === null || val === void 0 ? void 0 : val._id,
+              label: (val === null || val === void 0 ? void 0 : val.UOM) && (val === null || val === void 0 ? void 0 : val.shortdesc) ? (val === null || val === void 0 ? void 0 : val.UOM) + " - " + (val === null || val === void 0 ? void 0 : val.shortdesc) : "",
+              id: val === null || val === void 0 ? void 0 : val.id
             });
           });
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -32840,9 +33158,37 @@ var DOSAGEFORM_MASTER = createAsyncThunk("MedicationMastersSlice/DosageForm_mast
     }
   }, _callee11, null, [[2, 11]]);
 })));
+
+var constructFreqDetls = function constructFreqDetls(data) {
+  debugger;
+  var arr = [];
+
+  if (Array.isArray(data) && (data === null || data === void 0 ? void 0 : data.length) > 0) {
+    data.map(function (v) {
+      var _ref23, _ref24, _v$basefreq$val, _v$basefreq, _v$basefreq2, _v$day, _v$day2, _v$day3, _v$day4, _v$adminDosageInstruc;
+
+      arr.push({
+        remarks: (v === null || v === void 0 ? void 0 : v.remarks) || "",
+        dose: (v === null || v === void 0 ? void 0 : v.dose) || "",
+        time: (v === null || v === void 0 ? void 0 : v.time) || "",
+        baseFreq: (_ref23 = (_ref24 = (_v$basefreq$val = v === null || v === void 0 ? void 0 : (_v$basefreq = v.basefreq) === null || _v$basefreq === void 0 ? void 0 : _v$basefreq.val) !== null && _v$basefreq$val !== void 0 ? _v$basefreq$val : v === null || v === void 0 ? void 0 : (_v$basefreq2 = v.basefreq) === null || _v$basefreq2 === void 0 ? void 0 : _v$basefreq2.freqcode) !== null && _ref24 !== void 0 ? _ref24 : v === null || v === void 0 ? void 0 : v.baseFreq) !== null && _ref23 !== void 0 ? _ref23 : "",
+        weekDay: (v === null || v === void 0 ? void 0 : v.weekDay) || (v === null || v === void 0 ? void 0 : v.weekday) || "",
+        day: (v === null || v === void 0 ? void 0 : (_v$day = v.day) === null || _v$day === void 0 ? void 0 : _v$day.code) ? Number(v === null || v === void 0 ? void 0 : (_v$day2 = v.day) === null || _v$day2 === void 0 ? void 0 : _v$day2.code) ? JSON.parse(v === null || v === void 0 ? void 0 : (_v$day3 = v.day) === null || _v$day3 === void 0 ? void 0 : _v$day3.code) : v === null || v === void 0 ? void 0 : (_v$day4 = v.day) === null || _v$day4 === void 0 ? void 0 : _v$day4.code : 0,
+        fromDay: (v === null || v === void 0 ? void 0 : v.fromDay) ? Number(v === null || v === void 0 ? void 0 : v.fromDay) ? JSON.parse(v === null || v === void 0 ? void 0 : v.fromDay) : v === null || v === void 0 ? void 0 : v.fromDay : 0,
+        toDay: (v === null || v === void 0 ? void 0 : v.toDay) ? Number(v === null || v === void 0 ? void 0 : v.toDay) ? JSON.parse(v === null || v === void 0 ? void 0 : v.toDay) : v === null || v === void 0 ? void 0 : v.toDay : 0,
+        fromDate: (v === null || v === void 0 ? void 0 : v.fromDate) ? Number(v === null || v === void 0 ? void 0 : v.fromDate) ? JSON.parse(v === null || v === void 0 ? void 0 : v.fromDate) : v === null || v === void 0 ? void 0 : v.fromDate : 0,
+        toDate: (v === null || v === void 0 ? void 0 : v.toDate) ? Number(v === null || v === void 0 ? void 0 : v.toDate) ? JSON.parse(v === null || v === void 0 ? void 0 : v.toDate) : v === null || v === void 0 ? void 0 : v.toDate : 0,
+        adminDosageInstruction: (_v$adminDosageInstruc = v === null || v === void 0 ? void 0 : v.adminDosageInstruction) !== null && _v$adminDosageInstruc !== void 0 ? _v$adminDosageInstruc : ""
+      });
+    });
+  }
+
+  return arr;
+};
+
 var FREQUENCYMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/FrequencyMaster_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
-      _ref24,
+      _ref26,
       rejectWithValue,
       data,
       arr,
@@ -32853,7 +33199,7 @@ var FREQUENCYMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/FrequencyM
       switch (_context12.prev = _context12.next) {
         case 0:
           payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
-          _ref24 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref24.rejectWithValue;
+          _ref26 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
           _context12.prev = 2;
           _context12.next = 5;
           return fetchData$3({
@@ -32864,12 +33210,14 @@ var FREQUENCYMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/FrequencyM
           data = _context12.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc7;
+            var _val$scheduleline;
 
             arr.push({
-              value: val._id,
-              label: (_val$shortdesc7 = val.shortdesc) !== null && _val$shortdesc7 !== void 0 ? _val$shortdesc7 : "",
-              id: val.id
+              value: val === null || val === void 0 ? void 0 : val._id,
+              label: (val === null || val === void 0 ? void 0 : val.freqcode) && (val === null || val === void 0 ? void 0 : val.shortdesc) ? (val === null || val === void 0 ? void 0 : val.freqcode) + " - " + (val === null || val === void 0 ? void 0 : val.shortdesc) : "",
+              id: val === null || val === void 0 ? void 0 : val.id,
+              freqCode: val === null || val === void 0 ? void 0 : val.freqcode,
+              FreqDetls: Array.isArray(val === null || val === void 0 ? void 0 : val.scheduleline) && (val === null || val === void 0 ? void 0 : val.scheduleline.length) > 0 ? constructFreqDetls((_val$scheduleline = val === null || val === void 0 ? void 0 : val.scheduleline) !== null && _val$scheduleline !== void 0 ? _val$scheduleline : []) : []
             });
           });
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -32892,7 +33240,7 @@ var FREQUENCYMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/FrequencyM
 })));
 var DURATIONTYPE_MASTER = createAsyncThunk("MedicationMastersSlice/DurationType_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
   var payload,
-      _ref26,
+      _ref28,
       rejectWithValue,
       data,
       arr,
@@ -32903,7 +33251,7 @@ var DURATIONTYPE_MASTER = createAsyncThunk("MedicationMastersSlice/DurationType_
       switch (_context13.prev = _context13.next) {
         case 0:
           payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
-          _ref26 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
+          _ref28 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref28.rejectWithValue;
           _context13.prev = 2;
           _context13.next = 5;
           return fetchData$3({
@@ -32914,12 +33262,12 @@ var DURATIONTYPE_MASTER = createAsyncThunk("MedicationMastersSlice/DurationType_
           data = _context13.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc8, _val$shortdesc$, _val$shortdesc9;
+            var _val$shortdesc7, _val$shortdesc$, _val$shortdesc8;
 
             arr.push({
               value: val._id,
-              label: (_val$shortdesc8 = val.shortdesc) !== null && _val$shortdesc8 !== void 0 ? _val$shortdesc8 : "",
-              type: (_val$shortdesc$ = (_val$shortdesc9 = val.shortdesc) === null || _val$shortdesc9 === void 0 ? void 0 : _val$shortdesc9[0]) !== null && _val$shortdesc$ !== void 0 ? _val$shortdesc$ : "",
+              label: (_val$shortdesc7 = val.shortdesc) !== null && _val$shortdesc7 !== void 0 ? _val$shortdesc7 : "",
+              type: (_val$shortdesc$ = (_val$shortdesc8 = val.shortdesc) === null || _val$shortdesc8 === void 0 ? void 0 : _val$shortdesc8[0]) !== null && _val$shortdesc$ !== void 0 ? _val$shortdesc$ : "",
               id: val.id
             });
           });
@@ -32943,7 +33291,7 @@ var DURATIONTYPE_MASTER = createAsyncThunk("MedicationMastersSlice/DurationType_
 })));
 var PRIORITY_MASTER = createAsyncThunk("MedicationMastersSlice/Priority_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
-      _ref28,
+      _ref30,
       rejectWithValue,
       data,
       arr,
@@ -32954,7 +33302,7 @@ var PRIORITY_MASTER = createAsyncThunk("MedicationMastersSlice/Priority_masters"
       switch (_context14.prev = _context14.next) {
         case 0:
           payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-          _ref28 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref28.rejectWithValue;
+          _ref30 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref30.rejectWithValue;
           _context14.prev = 2;
           _context14.next = 5;
           return fetchData$3({
@@ -32994,7 +33342,7 @@ var PRIORITY_MASTER = createAsyncThunk("MedicationMastersSlice/Priority_masters"
 })));
 var DRUGCATEGORY_MASTER = createAsyncThunk("MedicationMastersSlice/DrugCategory_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
   var payload,
-      _ref30,
+      _ref32,
       rejectWithValue,
       data,
       arr,
@@ -33005,7 +33353,7 @@ var DRUGCATEGORY_MASTER = createAsyncThunk("MedicationMastersSlice/DrugCategory_
       switch (_context15.prev = _context15.next) {
         case 0:
           payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
-          _ref30 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref30.rejectWithValue;
+          _ref32 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
           _context15.prev = 2;
           _context15.next = 5;
           return fetchData$3({
@@ -33016,11 +33364,11 @@ var DRUGCATEGORY_MASTER = createAsyncThunk("MedicationMastersSlice/DrugCategory_
           data = _context15.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc10;
+            var _val$shortdesc9;
 
             arr.push({
               value: val._id,
-              label: (_val$shortdesc10 = val.shortdesc) !== null && _val$shortdesc10 !== void 0 ? _val$shortdesc10 : "",
+              label: (_val$shortdesc9 = val.shortdesc) !== null && _val$shortdesc9 !== void 0 ? _val$shortdesc9 : "",
               id: val.id
             });
           });
@@ -33044,7 +33392,7 @@ var DRUGCATEGORY_MASTER = createAsyncThunk("MedicationMastersSlice/DrugCategory_
 })));
 var ORDERNATURE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderNature_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
   var payload,
-      _ref32,
+      _ref34,
       rejectWithValue,
       data,
       arr,
@@ -33055,7 +33403,7 @@ var ORDERNATURE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderNature_ma
       switch (_context16.prev = _context16.next) {
         case 0:
           payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
-          _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
+          _ref34 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
           _context16.prev = 2;
           _context16.next = 5;
           return fetchData$3({
@@ -33094,7 +33442,7 @@ var ORDERNATURE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderNature_ma
 })));
 var ORDERMODE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderMode_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
   var payload,
-      _ref34,
+      _ref36,
       rejectWithValue,
       data,
       arr,
@@ -33105,7 +33453,7 @@ var ORDERMODE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderMode_master
       switch (_context17.prev = _context17.next) {
         case 0:
           payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
-          _ref34 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
+          _ref36 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
           _context17.prev = 2;
           _context17.next = 5;
           return fetchData$3({
@@ -33144,7 +33492,7 @@ var ORDERMODE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderMode_master
 })));
 var DRUGSTOREDISPLOC_MASTER = createAsyncThunk("MedicationMastersSlice/DrugStoreDispLoc_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
   var payload,
-      _ref36,
+      _ref38,
       rejectWithValue,
       data,
       arr,
@@ -33155,7 +33503,7 @@ var DRUGSTOREDISPLOC_MASTER = createAsyncThunk("MedicationMastersSlice/DrugStore
       switch (_context18.prev = _context18.next) {
         case 0:
           payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
-          _ref36 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
+          _ref38 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
           _context18.prev = 2;
           _context18.next = 5;
           return fetchData$3({
@@ -33194,7 +33542,7 @@ var DRUGSTOREDISPLOC_MASTER = createAsyncThunk("MedicationMastersSlice/DrugStore
 })));
 var DIAGNOSISAGAINSTENCOUNTER_MASTER = createAsyncThunk("MedicationMastersSlice/DiagnosisAgainstEncounter_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
   var payload,
-      _ref38,
+      _ref40,
       rejectWithValue,
       data,
       arr,
@@ -33205,7 +33553,7 @@ var DIAGNOSISAGAINSTENCOUNTER_MASTER = createAsyncThunk("MedicationMastersSlice/
       switch (_context19.prev = _context19.next) {
         case 0:
           payload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
-          _ref38 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
+          _ref40 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref40.rejectWithValue;
           _context19.prev = 2;
           _context19.next = 5;
           return fetchData$3({
@@ -33244,7 +33592,7 @@ var DIAGNOSISAGAINSTENCOUNTER_MASTER = createAsyncThunk("MedicationMastersSlice/
 })));
 var REASONCODE_MASTER = createAsyncThunk("MedicationMastersSlice/Reasoncode_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee20() {
   var payload,
-      _ref40,
+      _ref42,
       rejectWithValue,
       data,
       arr,
@@ -33255,7 +33603,7 @@ var REASONCODE_MASTER = createAsyncThunk("MedicationMastersSlice/Reasoncode_mast
       switch (_context20.prev = _context20.next) {
         case 0:
           payload = _args20.length > 0 && _args20[0] !== undefined ? _args20[0] : {};
-          _ref40 = _args20.length > 1 ? _args20[1] : undefined, rejectWithValue = _ref40.rejectWithValue;
+          _ref42 = _args20.length > 1 ? _args20[1] : undefined, rejectWithValue = _ref42.rejectWithValue;
           _context20.prev = 2;
           _context20.next = 5;
           return fetchData$3({
@@ -33294,7 +33642,7 @@ var REASONCODE_MASTER = createAsyncThunk("MedicationMastersSlice/Reasoncode_mast
 })));
 var ORGANIZATION_MASTER = createAsyncThunk("MedicationMastersSlice/Organization_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee21() {
   var payload,
-      _ref42,
+      _ref44,
       rejectWithValue,
       data,
       arr,
@@ -33305,7 +33653,7 @@ var ORGANIZATION_MASTER = createAsyncThunk("MedicationMastersSlice/Organization_
       switch (_context21.prev = _context21.next) {
         case 0:
           payload = _args21.length > 0 && _args21[0] !== undefined ? _args21[0] : {};
-          _ref42 = _args21.length > 1 ? _args21[1] : undefined, rejectWithValue = _ref42.rejectWithValue;
+          _ref44 = _args21.length > 1 ? _args21[1] : undefined, rejectWithValue = _ref44.rejectWithValue;
           _context21.prev = 2;
           _context21.next = 5;
           return fetchData$3({
@@ -33344,7 +33692,7 @@ var ORGANIZATION_MASTER = createAsyncThunk("MedicationMastersSlice/Organization_
 })));
 var PATIENT_INSTRUCTIONS_MASTER = createAsyncThunk("MedicationMastersSlice/Patient_Instruction", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee22() {
   var payload,
-      _ref44,
+      _ref46,
       rejectWithValue,
       data,
       arr,
@@ -33355,7 +33703,7 @@ var PATIENT_INSTRUCTIONS_MASTER = createAsyncThunk("MedicationMastersSlice/Patie
       switch (_context22.prev = _context22.next) {
         case 0:
           payload = _args22.length > 0 && _args22[0] !== undefined ? _args22[0] : {};
-          _ref44 = _args22.length > 1 ? _args22[1] : undefined, rejectWithValue = _ref44.rejectWithValue;
+          _ref46 = _args22.length > 1 ? _args22[1] : undefined, rejectWithValue = _ref46.rejectWithValue;
           _context22.prev = 2;
           _context22.next = 5;
           return fetchData$3({
@@ -33395,7 +33743,7 @@ var PATIENT_INSTRUCTIONS_MASTER = createAsyncThunk("MedicationMastersSlice/Patie
 })));
 var STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/status_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee23() {
   var payload,
-      _ref46,
+      _ref48,
       rejectWithValue,
       data,
       arr,
@@ -33406,7 +33754,7 @@ var STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/status_masters", /*
       switch (_context23.prev = _context23.next) {
         case 0:
           payload = _args23.length > 0 && _args23[0] !== undefined ? _args23[0] : {};
-          _ref46 = _args23.length > 1 ? _args23[1] : undefined, rejectWithValue = _ref46.rejectWithValue;
+          _ref48 = _args23.length > 1 ? _args23[1] : undefined, rejectWithValue = _ref48.rejectWithValue;
           _context23.prev = 2;
           _context23.next = 5;
           return fetchData$3({
@@ -33446,7 +33794,7 @@ var STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/status_masters", /*
 })));
 var PRACTITIONERROLE_MASTER = createAsyncThunk("MedicationMastersSlice/PractitionerRole_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
   var payload,
-      _ref48,
+      _ref50,
       rejectWithValue,
       data,
       arr,
@@ -33457,7 +33805,7 @@ var PRACTITIONERROLE_MASTER = createAsyncThunk("MedicationMastersSlice/Practitio
       switch (_context24.prev = _context24.next) {
         case 0:
           payload = _args24.length > 0 && _args24[0] !== undefined ? _args24[0] : {};
-          _ref48 = _args24.length > 1 ? _args24[1] : undefined, rejectWithValue = _ref48.rejectWithValue;
+          _ref50 = _args24.length > 1 ? _args24[1] : undefined, rejectWithValue = _ref50.rejectWithValue;
           _context24.prev = 2;
           _context24.next = 5;
           return fetchData$3({
@@ -33496,7 +33844,7 @@ var PRACTITIONERROLE_MASTER = createAsyncThunk("MedicationMastersSlice/Practitio
 })));
 var PRACTITIONER_MASTER = createAsyncThunk("MedicationMastersSlice/Practitioner_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee25() {
   var payload,
-      _ref50,
+      _ref52,
       rejectWithValue,
       data,
       arr,
@@ -33507,7 +33855,7 @@ var PRACTITIONER_MASTER = createAsyncThunk("MedicationMastersSlice/Practitioner_
       switch (_context25.prev = _context25.next) {
         case 0:
           payload = _args25.length > 0 && _args25[0] !== undefined ? _args25[0] : {};
-          _ref50 = _args25.length > 1 ? _args25[1] : undefined, rejectWithValue = _ref50.rejectWithValue;
+          _ref52 = _args25.length > 1 ? _args25[1] : undefined, rejectWithValue = _ref52.rejectWithValue;
           _context25.prev = 2;
           _context25.next = 5;
           return fetchData$3({
@@ -33545,7 +33893,7 @@ var PRACTITIONER_MASTER = createAsyncThunk("MedicationMastersSlice/Practitioner_
 })));
 var INFUSIONRATEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/InfusionRateUoM_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee26() {
   var payload,
-      _ref52,
+      _ref54,
       rejectWithValue,
       data,
       arr,
@@ -33556,7 +33904,7 @@ var INFUSIONRATEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/InfusionRa
       switch (_context26.prev = _context26.next) {
         case 0:
           payload = _args26.length > 0 && _args26[0] !== undefined ? _args26[0] : {};
-          _ref52 = _args26.length > 1 ? _args26[1] : undefined, rejectWithValue = _ref52.rejectWithValue;
+          _ref54 = _args26.length > 1 ? _args26[1] : undefined, rejectWithValue = _ref54.rejectWithValue;
           _context26.prev = 2;
           _context26.next = 5;
           return fetchData$3({
@@ -33567,11 +33915,11 @@ var INFUSIONRATEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/InfusionRa
           data = _context26.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc11;
+            var _val$shortdesc10;
 
             arr.push({
               value: val._id,
-              label: (_val$shortdesc11 = val.shortdesc) !== null && _val$shortdesc11 !== void 0 ? _val$shortdesc11 : "",
+              label: (_val$shortdesc10 = val.shortdesc) !== null && _val$shortdesc10 !== void 0 ? _val$shortdesc10 : "",
               id: val.id
             });
           });
@@ -33595,7 +33943,7 @@ var INFUSIONRATEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/InfusionRa
 })));
 var TOTALVOLUMEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/TotalVolumeUoM_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee27() {
   var payload,
-      _ref54,
+      _ref56,
       rejectWithValue,
       data,
       arr,
@@ -33606,7 +33954,7 @@ var TOTALVOLUMEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/TotalVolume
       switch (_context27.prev = _context27.next) {
         case 0:
           payload = _args27.length > 0 && _args27[0] !== undefined ? _args27[0] : {};
-          _ref54 = _args27.length > 1 ? _args27[1] : undefined, rejectWithValue = _ref54.rejectWithValue;
+          _ref56 = _args27.length > 1 ? _args27[1] : undefined, rejectWithValue = _ref56.rejectWithValue;
           _context27.prev = 2;
           _context27.next = 5;
           return fetchData$3({
@@ -33617,11 +33965,11 @@ var TOTALVOLUMEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/TotalVolume
           data = _context27.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc12;
+            var _val$shortdesc11;
 
             arr.push({
               value: val._id,
-              label: (_val$shortdesc12 = val.shortdesc) !== null && _val$shortdesc12 !== void 0 ? _val$shortdesc12 : "",
+              label: (_val$shortdesc11 = val.shortdesc) !== null && _val$shortdesc11 !== void 0 ? _val$shortdesc11 : "",
               id: val.id
             });
           });
@@ -33645,7 +33993,7 @@ var TOTALVOLUMEUOM_MASTER = createAsyncThunk("MedicationMastersSlice/TotalVolume
 })));
 var INDICATION_REASON_CODE_MASTER = createAsyncThunk("MedicationMastersSlice/Indication_Reason_Code_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee28() {
   var payload,
-      _ref56,
+      _ref58,
       rejectWithValue,
       data,
       arr,
@@ -33656,7 +34004,7 @@ var INDICATION_REASON_CODE_MASTER = createAsyncThunk("MedicationMastersSlice/Ind
       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;
+          _ref58 = _args28.length > 1 ? _args28[1] : undefined, rejectWithValue = _ref58.rejectWithValue;
           _context28.prev = 2;
           _context28.next = 5;
           return fetchData$3({
@@ -33695,7 +34043,7 @@ var INDICATION_REASON_CODE_MASTER = createAsyncThunk("MedicationMastersSlice/Ind
 })));
 var BASESCHEDULE_MASTER = createAsyncThunk("MedicationMastersSlice/BaseSchedule_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee29() {
   var payload,
-      _ref58,
+      _ref60,
       rejectWithValue,
       data,
       arr,
@@ -33706,7 +34054,7 @@ var BASESCHEDULE_MASTER = createAsyncThunk("MedicationMastersSlice/BaseSchedule_
       switch (_context29.prev = _context29.next) {
         case 0:
           payload = _args29.length > 0 && _args29[0] !== undefined ? _args29[0] : {};
-          _ref58 = _args29.length > 1 ? _args29[1] : undefined, rejectWithValue = _ref58.rejectWithValue;
+          _ref60 = _args29.length > 1 ? _args29[1] : undefined, rejectWithValue = _ref60.rejectWithValue;
           _context29.prev = 2;
           _context29.next = 5;
           return fetchData$3({
@@ -33717,11 +34065,11 @@ var BASESCHEDULE_MASTER = createAsyncThunk("MedicationMastersSlice/BaseSchedule_
           data = _context29.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$shortdesc13;
+            var _val$shortdesc12;
 
             arr.push({
               value: val._id,
-              label: (_val$shortdesc13 = val.shortdesc) !== null && _val$shortdesc13 !== void 0 ? _val$shortdesc13 : "",
+              label: (_val$shortdesc12 = val.shortdesc) !== null && _val$shortdesc12 !== void 0 ? _val$shortdesc12 : "",
               id: val.id
             });
           });
@@ -33745,7 +34093,7 @@ var BASESCHEDULE_MASTER = createAsyncThunk("MedicationMastersSlice/BaseSchedule_
 })));
 var DELETEMEDICATION_MASTER = createAsyncThunk("MedicationMastersSlice/DeleteMedication_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee30() {
   var payload,
-      _ref60,
+      _ref62,
       rejectWithValue,
       data,
       _args30 = arguments;
@@ -33755,7 +34103,7 @@ var DELETEMEDICATION_MASTER = createAsyncThunk("MedicationMastersSlice/DeleteMed
       switch (_context30.prev = _context30.next) {
         case 0:
           payload = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {};
-          _ref60 = _args30.length > 1 ? _args30[1] : undefined, rejectWithValue = _ref60.rejectWithValue;
+          _ref62 = _args30.length > 1 ? _args30[1] : undefined, rejectWithValue = _ref62.rejectWithValue;
           _context30.prev = 2;
           _context30.next = 5;
           return fetchData$3({
@@ -33784,7 +34132,7 @@ var DELETEMEDICATION_MASTER = createAsyncThunk("MedicationMastersSlice/DeleteMed
 })));
 var WORKFLOW_STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/workflow_status_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee31() {
   var payload,
-      _ref62,
+      _ref64,
       rejectWithValue,
       data,
       arr,
@@ -33795,7 +34143,7 @@ var WORKFLOW_STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/workflow_s
       switch (_context31.prev = _context31.next) {
         case 0:
           payload = _args31.length > 0 && _args31[0] !== undefined ? _args31[0] : {};
-          _ref62 = _args31.length > 1 ? _args31[1] : undefined, rejectWithValue = _ref62.rejectWithValue;
+          _ref64 = _args31.length > 1 ? _args31[1] : undefined, rejectWithValue = _ref64.rejectWithValue;
           _context31.prev = 2;
           _context31.next = 5;
           return fetchData$3({
@@ -34220,7 +34568,7 @@ var ALERT_CODES = createAsyncThunk("medicationsSlice/alert_codes", /*#__PURE__*/
   var payload,
       _ref2,
       rejectWithValue,
-      list,
+      _list,
       data,
       code,
       _args = arguments;
@@ -34232,10 +34580,10 @@ var ALERT_CODES = createAsyncThunk("medicationsSlice/alert_codes", /*#__PURE__*/
           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;
+          _list = payload.list;
           _context.next = 6;
           return fetchData$3({
-            body: JSON.stringify(codeQuery.AllergyCodes(list))
+            body: JSON.stringify(codeQuery.AllergyCodes(_list))
           }, __readDocumentUrl__);
 
         case 6:
@@ -34267,7 +34615,7 @@ var DRUG_CODES = createAsyncThunk("medicationsSlice/drug_codes", /*#__PURE__*/_a
   var payload,
       _ref4,
       rejectWithValue,
-      list,
+      _list2,
       data,
       code,
       _args2 = arguments;
@@ -34279,10 +34627,10 @@ var DRUG_CODES = createAsyncThunk("medicationsSlice/drug_codes", /*#__PURE__*/_a
           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;
+          _list2 = payload.list;
           _context2.next = 6;
           return fetchData$3({
-            body: JSON.stringify(codeQuery.DrugCodes(list))
+            body: JSON.stringify(codeQuery.DrugCodes(_list2))
           }, __readDocumentUrl__);
 
         case 6:
@@ -34318,7 +34666,15 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
       _data$Result$,
       _data$Result$$propert,
       _data$Result$$propert2,
-      list,
+      _data$Result2,
+      _data$Result2$,
+      _data$Result2$$proper,
+      _data$Result2$$proper2,
+      _data$Result3,
+      _data$Result3$,
+      _data$Result3$$proper,
+      _data$Result3$$proper2,
+      _list3,
       orgData,
       body,
       data,
@@ -34331,7 +34687,7 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
           payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
           _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
           _context3.prev = 2;
-          list = payload;
+          _list3 = payload;
           _context3.next = 6;
           return fetchData$3({
             body: queries$5.getOrganizationId(payload.orgId)
@@ -34339,7 +34695,7 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
 
         case 6:
           orgData = _context3.sent;
-          body = generateJSON$6(list, orgData.result[0]);
+          body = generateJSON$6(_list3, orgData.result[0]);
           _context3.next = 10;
           return fetchData$3({
             body: JSON.stringify(body)
@@ -34348,7 +34704,11 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
         case 10:
           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
+            data: {
+              orderId: 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,
+              drugCode: 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.drugCode,
+              _key: data === null || data === void 0 ? void 0 : (_data$Result3 = data.Result) === null || _data$Result3 === void 0 ? void 0 : (_data$Result3$ = _data$Result3[0]) === null || _data$Result3$ === void 0 ? void 0 : (_data$Result3$$proper = _data$Result3$.properties) === null || _data$Result3$$proper === void 0 ? void 0 : (_data$Result3$$proper2 = _data$Result3$$proper.doc) === null || _data$Result3$$proper2 === void 0 ? void 0 : _data$Result3$$proper2._key
+            }
           }));
 
         case 14:
@@ -34366,16 +34726,10 @@ var SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/save_medication", /*#_
     }
   }, _callee3, null, [[2, 14]]);
 })));
-var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+var SAVE_NIFI_MEDICATIONS = createAsyncThunk("medicationsSlice/save_nifi_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
   var payload,
       _ref8,
       rejectWithValue,
-      _list$status,
-      _data$Result2,
-      _data$Result2$,
-      _data$Result2$$proper,
-      _data$Result2$$proper2,
-      list,
       body,
       data,
       _args4 = arguments;
@@ -34387,17 +34741,130 @@ var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication",
           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();
+          debugger;
+          body = generate_NIFI_JSON(payload);
+          debugger;
+          _context4.next = 8;
+          return fetchData$3({
+            body: JSON.stringify(body)
+          }, __OrderlinewithQueue__);
+
+        case 8:
+          data = _context4.sent;
+          debugger;
+          return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data
+          }));
+
+        case 13:
+          _context4.prev = 13;
+          _context4.t0 = _context4["catch"](2);
+          console.log(_context4.t0);
+          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context4.t0.message
+          })));
+
+        case 17:
+        case "end":
+          return _context4.stop();
+      }
+    }
+  }, _callee4, null, [[2, 13]]);
+})));
+var BULK_SAVE_MEDICATIONS = createAsyncThunk("medicationsSlice/bulk_save_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+  var payload,
+      _ref10,
+      rejectWithValue,
+      getState,
+      _data$Result4,
+      _data$Result4$,
+      _data$Result4$$proper,
+      _data$Result4$$proper2,
+      _key,
+      drugCode,
+      dataJson,
+      data,
+      _args5 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee5$(_context5) {
+    while (1) {
+      switch (_context5.prev = _context5.next) {
+        case 0:
+          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+          _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue, getState = _ref10.getState;
+          _context5.prev = 2;
+          _key = payload._key, drugCode = payload.drugCode;
+          dataJson = [{
+            "db_name": dbName,
+            "entity": "PH_OrderLine",
+            "is_metadata": true,
+            "metadataId": "04ecb73d-f048-44ce-8563-c9be015812dd",
+            "filter": {
+              "_key": _key !== null && _key !== void 0 ? _key : ''
+            },
+            "doc": {
+              "status": "CodingMaster/10704",
+              "drugCode": drugCode !== null && drugCode !== void 0 ? drugCode : ''
+            }
+          }];
+          _context5.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(dataJson)
+          }, __OrderlinewithQueue__);
+
+        case 7:
+          data = _context5.sent;
+          return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: list.isAdd ? !(data === null || data === void 0 ? void 0 : data.error) : data === null || data === void 0 ? void 0 : (_data$Result4 = data.Result) === null || _data$Result4 === void 0 ? void 0 : (_data$Result4$ = _data$Result4[0]) === null || _data$Result4$ === void 0 ? void 0 : (_data$Result4$$proper = _data$Result4$.properties) === null || _data$Result4$$proper === void 0 ? void 0 : (_data$Result4$$proper2 = _data$Result4$$proper.doc) === null || _data$Result4$$proper2 === void 0 ? void 0 : _data$Result4$$proper2._id
+          }));
+
+        case 11:
+          _context5.prev = 11;
+          _context5.t0 = _context5["catch"](2);
+          console.log(_context5.t0);
+          return _context5.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context5.t0.message
+          })));
+
+        case 15:
+        case "end":
+          return _context5.stop();
+      }
+    }
+  }, _callee5, null, [[2, 11]]);
+})));
+var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+  var payload,
+      _ref12,
+      rejectWithValue,
+      _list4$status,
+      _data$Result5,
+      _data$Result5$,
+      _data$Result5$$proper,
+      _data$Result5$$proper2,
+      _list4,
+      body,
+      data,
+      _args6 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee6$(_context6) {
+    while (1) {
+      switch (_context6.prev = _context6.next) {
+        case 0:
+          payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          _ref12 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref12.rejectWithValue;
+          _context6.prev = 2;
+          _list4 = payload; // const states = getState();
 
           body = [{
             db_name: dbName,
             entity: "PH_OrderLine",
-            filter: "PH_OrderLine._id=='".concat(list.id, "'"),
+            filter: "PH_OrderLine._id=='".concat(_list4.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
+              status: (_list4$status = _list4.status) === null || _list4$status === void 0 ? void 0 : _list4$status.value,
+              statusreason: _list4.statusReason,
+              statusperiod: _list4.statusperiod,
+              statushistory: _list4.statushistory
             }
           }]; // if (list.status?.label === "Complete") {
           //     let flowStatusList = [];
@@ -34410,76 +34877,76 @@ var UPDATE_MEDICATIONS = createAsyncThunk("medicationsSlice/update_medication",
           //         ))
           // }
 
-          _context4.next = 7;
+          _context6.next = 7;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __update__);
 
         case 7:
-          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
+          data = _context6.sent;
+          return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data === null || data === void 0 ? void 0 : (_data$Result5 = data.Result) === null || _data$Result5 === void 0 ? void 0 : (_data$Result5$ = _data$Result5[0]) === null || _data$Result5$ === void 0 ? void 0 : (_data$Result5$$proper = _data$Result5$.properties) === null || _data$Result5$$proper === void 0 ? void 0 : (_data$Result5$$proper2 = _data$Result5$$proper.doc) === null || _data$Result5$$proper2 === void 0 ? void 0 : _data$Result5$$proper2._id
           }));
 
         case 11:
-          _context4.prev = 11;
-          _context4.t0 = _context4["catch"](2);
-          console.log(_context4.t0);
-          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context4.t0.message
+          _context6.prev = 11;
+          _context6.t0 = _context6["catch"](2);
+          console.log(_context6.t0);
+          return _context6.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context6.t0.message
           })));
 
         case 15:
         case "end":
-          return _context4.stop();
+          return _context6.stop();
       }
     }
-  }, _callee4, null, [[2, 11]]);
+  }, _callee6, null, [[2, 11]]);
 })));
-var GET_MEDICATIONS = createAsyncThunk("medicationsSlice/medication_list", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+var GET_MEDICATIONS = createAsyncThunk("medicationsSlice/medication_list", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
   var payload,
-      _ref10,
+      _ref14,
       rejectWithValue,
       id,
       data,
-      _args5 = arguments;
+      _args7 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee5$(_context5) {
+  return regeneratorRuntime.wrap(function _callee7$(_context7) {
     while (1) {
-      switch (_context5.prev = _context5.next) {
+      switch (_context7.prev = _context7.next) {
         case 0:
-          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
-          _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
-          _context5.prev = 2;
+          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;
-          _context5.next = 6;
+          _context7.next = 6;
           return fetchData$3({
             body: queries$5.getMedications(id)
           }, __readDocumentUrl__);
 
         case 6:
-          data = _context5.sent;
-          return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context7.sent;
+          return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data === null || data === void 0 ? void 0 : data.result
           }));
 
         case 10:
-          _context5.prev = 10;
-          _context5.t0 = _context5["catch"](2);
-          return _context5.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context5.t0.message
+          _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 _context5.stop();
+          return _context7.stop();
       }
     }
-  }, _callee5, null, [[2, 10]]);
+  }, _callee7, null, [[2, 10]]);
 })));
-var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workflow_status", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workflow_status", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
   var payload,
-      _ref12,
+      _ref16,
       rejectWithValue,
       getState,
       personId,
@@ -34492,15 +34959,15 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
       arr,
       data,
       PH_PresWorkflowStatusTrx,
-      _args6 = arguments;
+      _args8 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee6$(_context6) {
+  return regeneratorRuntime.wrap(function _callee8$(_context8) {
     while (1) {
-      switch (_context6.prev = _context6.next) {
+      switch (_context8.prev = _context8.next) {
         case 0:
-          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;
+          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;
           personId = payload.personId;
           states = getState();
           flowStatus = states.MedicationMastersSlice.workflow_status_masters.data.filter(function (val) {
@@ -34537,128 +35004,172 @@ var UPDATE_ALL_WORKFLOW_STATUS = createAsyncThunk("medicationsSlice/update_workf
               }
             };
           });
-          _context6.next = 13;
+          _context8.next = 13;
           return fetchData$3({
             body: JSON.stringify(arr)
           }, __update__);
 
         case 13:
-          data = _context6.sent;
-          _context6.next = 16;
+          data = _context8.sent;
+          _context8.next = 16;
           return fetchData$3({
             body: JSON.stringify(flowStatusList)
           }, __uspsertUrl__);
 
         case 16:
-          PH_PresWorkflowStatusTrx = _context6.sent;
-          return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          PH_PresWorkflowStatusTrx = _context8.sent;
+          return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data,
             PH_PresWorkflowStatusTrx: PH_PresWorkflowStatusTrx
           }));
 
         case 20:
-          _context6.prev = 20;
-          _context6.t0 = _context6["catch"](2);
-          console.log(_context6.t0);
-          return _context6.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context6.t0.message
+          _context8.prev = 20;
+          _context8.t0 = _context8["catch"](2);
+          console.log(_context8.t0);
+          return _context8.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context8.t0.message
           })));
 
         case 24:
         case "end":
-          return _context6.stop();
+          return _context8.stop();
       }
     }
-  }, _callee6, null, [[2, 20]]);
+  }, _callee8, null, [[2, 20]]);
 })));
-var PATIENT_BANNER = createAsyncThunk("medicationsSlice/patient_banner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
+var PATIENT_BANNER = createAsyncThunk("medicationsSlice/patient_banner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
   var payload,
-      _ref14,
+      _ref18,
       rejectWithValue,
       id,
       data,
-      _args7 = arguments;
+      _args9 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee7$(_context7) {
+  return regeneratorRuntime.wrap(function _callee9$(_context9) {
     while (1) {
-      switch (_context7.prev = _context7.next) {
+      switch (_context9.prev = _context9.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;
+          payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
+          _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue;
+          _context9.prev = 2;
           id = payload.id;
-          _context7.next = 6;
+          _context9.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 = _context9.sent;
+          return _context9.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
+          _context9.prev = 10;
+          _context9.t0 = _context9["catch"](2);
+          return _context9.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context9.t0.message
           })));
 
         case 13:
         case "end":
-          return _context7.stop();
+          return _context9.stop();
       }
     }
-  }, _callee7, null, [[2, 10]]);
+  }, _callee9, null, [[2, 10]]);
 })));
-var ENCOUNTER_BANNER = createAsyncThunk("medicationsSlice/Encounterbanner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+var ENCOUNTER_BANNER = createAsyncThunk("medicationsSlice/Encounterbanner", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
   var payload,
-      _ref16,
+      _ref20,
       rejectWithValue,
       getState,
       patientId,
       facilityId,
       data,
-      _args8 = arguments;
+      _args10 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee8$(_context8) {
+  return regeneratorRuntime.wrap(function _callee10$(_context10) {
     while (1) {
-      switch (_context8.prev = _context8.next) {
+      switch (_context10.prev = _context10.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;
+          payload = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
+          _ref20 = _args10.length > 1 ? _args10[1] : undefined, rejectWithValue = _ref20.rejectWithValue, getState = _ref20.getState;
+          _context10.prev = 2;
           patientId = payload.patientId, facilityId = payload.facilityId;
-          _context8.next = 6;
+          _context10.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 = _context10.sent;
+          return _context10.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
+          _context10.prev = 10;
+          _context10.t0 = _context10["catch"](2);
+          return _context10.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context10.t0.message
           })));
 
         case 13:
         case "end":
-          return _context8.stop();
+          return _context10.stop();
       }
     }
-  }, _callee8, null, [[2, 10]]);
+  }, _callee10, null, [[2, 10]]);
+})));
+var GET_ORDER_DATE = createAsyncThunk("medicationsSlice/get_orderDate", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+  var payload,
+      _ref22,
+      rejectWithValue,
+      _list5,
+      data,
+      _args11 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee11$(_context11) {
+    while (1) {
+      switch (_context11.prev = _context11.next) {
+        case 0:
+          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
+          _ref22 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref22.rejectWithValue;
+          _context11.prev = 2;
+          _list5 = payload;
+          _context11.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(_list5)
+          }, __GetOrderStartDate__);
+
+        case 6:
+          data = _context11.sent;
+          return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data
+          }));
+
+        case 10:
+          _context11.prev = 10;
+          _context11.t0 = _context11["catch"](2);
+          return _context11.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context11.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context11.stop();
+      }
+    }
+  }, _callee11, null, [[2, 10]]);
 })));
 var medicationsSlice = createSlice({
   name: "medicationsSlice",
   initialState: {
+    getOrderDate: _objectSpread2({}, defaultState.Info),
     save_medication: _objectSpread2({}, defaultState.Info),
+    save_nifi_medication: _objectSpread2({}, defaultState.Info),
+    bulk_save_medication: _objectSpread2({}, defaultState.Info),
     update_medication: _objectSpread2({}, defaultState.Info),
     update_workflow_status: _objectSpread2({}, defaultState.Info),
     medication_list: _objectSpread2({}, defaultState.List),
@@ -34667,97 +35178,130 @@ var medicationsSlice = createSlice({
     patientBanner: _objectSpread2({}, defaultState.List),
     Encounterbanner: _objectSpread2({}, defaultState.List)
   },
-  extraReducers: (_extraReducers$h = {}, _defineProperty(_extraReducers$h, PATIENT_BANNER.fulfilled, function (state, action) {
+  extraReducers: (_extraReducers$h = {}, _defineProperty(_extraReducers$h, GET_ORDER_DATE.fulfilled, function (state, action) {
     var _action$payload;
 
-    state.patientBanner = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+    state.getOrderDate = (_action$payload = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload !== void 0 ? _action$payload : {};
+  }), _defineProperty(_extraReducers$h, GET_ORDER_DATE.pending, function (state, action) {
+    state.getOrderDate.loading = true;
+  }), _defineProperty(_extraReducers$h, GET_ORDER_DATE.rejected, function (state, action) {
+    var _action$payload2;
+
+    state.getOrderDate = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+  }), _defineProperty(_extraReducers$h, PATIENT_BANNER.fulfilled, function (state, action) {
+    var _action$payload3;
+
+    state.patientBanner = (_action$payload3 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload3 !== void 0 ? _action$payload3 : {};
   }), _defineProperty(_extraReducers$h, PATIENT_BANNER.pending, function (state, action) {
     state.patientBanner.loading = true;
   }), _defineProperty(_extraReducers$h, PATIENT_BANNER.rejected, function (state, action) {
-    var _action$payload2;
+    var _action$payload4;
 
-    state.patientBanner = (_action$payload2 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload2 !== void 0 ? _action$payload2 : {};
+    state.patientBanner = (_action$payload4 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload4 !== void 0 ? _action$payload4 : {};
   }), _defineProperty(_extraReducers$h, ALERT_CODES.fulfilled, function (state, action) {
-    var _action$payload3;
+    var _action$payload5;
 
-    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 : {};
+    state.alert_codes.loading = false, state.alert_codes.error = false, state.alert_codes = (_action$payload5 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload5 !== void 0 ? _action$payload5 : {};
   }), _defineProperty(_extraReducers$h, ALERT_CODES.pending, function (state, action) {
     state.alert_codes.error = false, state.alert_codes.loading = true;
   }), _defineProperty(_extraReducers$h, ALERT_CODES.rejected, function (state, action) {
-    var _action$payload4;
+    var _action$payload6;
 
-    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 : {};
+    state.alert_codes.loading = false, state.alert_codes.error = true, state.alert_codes = (_action$payload6 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload6 !== void 0 ? _action$payload6 : {};
   }), _defineProperty(_extraReducers$h, DRUG_CODES.fulfilled, function (state, action) {
-    var _action$payload5;
+    var _action$payload7;
 
-    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 : {};
+    state.drug_codes.loading = false, state.drug_codes.error = false, state.drug_codes = (_action$payload7 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload7 !== void 0 ? _action$payload7 : {};
   }), _defineProperty(_extraReducers$h, DRUG_CODES.pending, function (state, action) {
     state.drug_codes.error = false, state.drug_codes.loading = true;
   }), _defineProperty(_extraReducers$h, DRUG_CODES.rejected, function (state, action) {
-    var _action$payload6;
+    var _action$payload8;
 
-    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 : {};
+    state.drug_codes.loading = false, state.drug_codes.error = true, state.drug_codes = (_action$payload8 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload8 !== void 0 ? _action$payload8 : {};
   }), _defineProperty(_extraReducers$h, SAVE_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload7;
+    var _action$payload9;
 
-    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 : {};
+    state.save_medication.loading = false, state.save_medication.error = false, state.save_medication = (_action$payload9 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload9 !== void 0 ? _action$payload9 : {};
   }), _defineProperty(_extraReducers$h, SAVE_MEDICATIONS.pending, function (state, action) {
     state.save_medication.error = false, state.save_medication.loading = true;
   }), _defineProperty(_extraReducers$h, SAVE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload8;
+    var _action$payload10;
+
+    state.save_medication.loading = false, state.save_medication.error = true, state.save_medication = (_action$payload10 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload10 !== void 0 ? _action$payload10 : {};
+  }), _defineProperty(_extraReducers$h, SAVE_NIFI_MEDICATIONS.fulfilled, function (state, action) {
+    var _action$payload11;
+
+    state.save_nifi_medication.loading = false, state.save_nifi_medication.error = false, state.save_nifi_medication = (_action$payload11 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload11 !== void 0 ? _action$payload11 : {};
+  }), _defineProperty(_extraReducers$h, SAVE_NIFI_MEDICATIONS.pending, function (state, action) {
+    state.save_nifi_medication.error = false, state.save_nifi_medication.loading = true;
+  }), _defineProperty(_extraReducers$h, SAVE_NIFI_MEDICATIONS.rejected, function (state, action) {
+    var _action$payload12;
 
-    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 : {};
+    state.save_nifi_medication.loading = false, state.save_nifi_medication.error = true, state.save_nifi_medication = (_action$payload12 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload12 !== void 0 ? _action$payload12 : {};
+  }), _defineProperty(_extraReducers$h, BULK_SAVE_MEDICATIONS.fulfilled, function (state, action) {
+    var _action$payload13;
+
+    state.bulk_save_medication.loading = false, state.bulk_save_medication.error = false, state.bulk_save_medication = (_action$payload13 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload13 !== void 0 ? _action$payload13 : {};
+  }), _defineProperty(_extraReducers$h, BULK_SAVE_MEDICATIONS.pending, function (state, action) {
+    state.bulk_save_medication.error = false, state.bulk_save_medication.loading = true;
+  }), _defineProperty(_extraReducers$h, BULK_SAVE_MEDICATIONS.rejected, function (state, action) {
+    var _action$payload14;
+
+    state.bulk_save_medication.loading = false, state.bulk_save_medication.error = true, state.bulk_save_medication = (_action$payload14 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload14 !== void 0 ? _action$payload14 : {};
   }), _defineProperty(_extraReducers$h, UPDATE_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload9;
+    var _action$payload15;
 
-    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 : {};
+    state.update_medication.loading = false, state.update_medication.error = false, state.update_medication = (_action$payload15 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload15 !== void 0 ? _action$payload15 : {};
   }), _defineProperty(_extraReducers$h, UPDATE_MEDICATIONS.pending, function (state, action) {
     state.update_medication.error = false, state.update_medication.loading = true;
   }), _defineProperty(_extraReducers$h, UPDATE_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload10;
+    var _action$payload16;
 
-    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 : {};
+    state.update_medication.loading = false, state.update_medication.error = true, state.update_medication = (_action$payload16 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload16 !== void 0 ? _action$payload16 : {};
   }), _defineProperty(_extraReducers$h, GET_MEDICATIONS.fulfilled, function (state, action) {
-    var _action$payload11;
+    var _action$payload17;
 
-    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 : {};
+    state.medication_list.loading = false, state.medication_list.error = false, state.medication_list = (_action$payload17 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload17 !== void 0 ? _action$payload17 : {};
   }), _defineProperty(_extraReducers$h, GET_MEDICATIONS.pending, function (state, action) {
     state.medication_list.error = false, state.medication_list.loading = true;
   }), _defineProperty(_extraReducers$h, GET_MEDICATIONS.rejected, function (state, action) {
-    var _action$payload12;
+    var _action$payload18;
 
-    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 : {};
+    state.medication_list.loading = false, state.medication_list.error = true, state.medication_list = (_action$payload18 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload18 !== void 0 ? _action$payload18 : {};
   }), _defineProperty(_extraReducers$h, UPDATE_ALL_WORKFLOW_STATUS.fulfilled, function (state, action) {
-    var _action$payload13;
+    var _action$payload19;
 
-    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 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = false, state.update_workflow_status = (_action$payload19 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload19 !== void 0 ? _action$payload19 : {};
   }), _defineProperty(_extraReducers$h, UPDATE_ALL_WORKFLOW_STATUS.pending, function (state, action) {
     state.update_workflow_status.error = false, state.update_workflow_status.loading = true;
   }), _defineProperty(_extraReducers$h, UPDATE_ALL_WORKFLOW_STATUS.rejected, function (state, action) {
-    var _action$payload14;
+    var _action$payload20;
 
-    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 : {};
+    state.update_workflow_status.loading = false, state.update_workflow_status.error = true, state.update_workflow_status = (_action$payload20 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload20 !== void 0 ? _action$payload20 : {};
   }), _defineProperty(_extraReducers$h, ENCOUNTER_BANNER.fulfilled, function (state, action) {
-    var _action$payload15;
+    var _action$payload21;
 
-    state.Encounterbanner = (_action$payload15 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload15 !== void 0 ? _action$payload15 : {};
+    state.Encounterbanner = (_action$payload21 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload21 !== void 0 ? _action$payload21 : {};
   }), _defineProperty(_extraReducers$h, ENCOUNTER_BANNER.pending, function (state, action) {
     state.Encounterbanner.loading = true;
   }), _defineProperty(_extraReducers$h, ENCOUNTER_BANNER.rejected, function (state, action) {
-    var _action$payload16;
+    var _action$payload22;
 
-    state.Encounterbanner = (_action$payload16 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload16 !== void 0 ? _action$payload16 : {};
+    state.Encounterbanner = (_action$payload22 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload22 !== void 0 ? _action$payload22 : {};
   }), _extraReducers$h)
 });
 var medicationsActions = {
   SAVE_MEDICATIONS: SAVE_MEDICATIONS,
+  BULK_SAVE_MEDICATIONS: BULK_SAVE_MEDICATIONS,
   GET_MEDICATIONS: GET_MEDICATIONS,
   UPDATE_MEDICATIONS: UPDATE_MEDICATIONS,
   UPDATE_ALL_WORKFLOW_STATUS: UPDATE_ALL_WORKFLOW_STATUS,
   ALERT_CODES: ALERT_CODES,
   DRUG_CODES: DRUG_CODES,
   PATIENT_BANNER: PATIENT_BANNER,
-  ENCOUNTER_BANNER: ENCOUNTER_BANNER
+  ENCOUNTER_BANNER: ENCOUNTER_BANNER,
+  GET_ORDER_DATE: GET_ORDER_DATE,
+  SAVE_NIFI_MEDICATIONS: SAVE_NIFI_MEDICATIONS
 };
 var medicationsSlice$1 = medicationsSlice.reducer;
 
@@ -35176,7 +35720,7 @@ var generateResJson$2 = function generateResJson(dataList, arr) {
         orderBy: {
           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]) || {})
+          label: makeName$1((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: {
@@ -35325,7 +35869,7 @@ var RecurrentgenerateResJson$1 = function RecurrentgenerateResJson(dataList, arr
         orderBy: {
           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]) || {})
+          label: makeName$1((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: {
@@ -37113,7 +37657,7 @@ var generateResJson$1 = function generateResJson(dataList, arr) {
         orderBy: {
           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]) || {})
+          label: makeName$1((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: {
@@ -37266,7 +37810,7 @@ var RecurrentgenerateResJson = function RecurrentgenerateResJson(dataList, arr)
         orderBy: {
           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]) || {})
+          label: makeName$1((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: {
@@ -39623,7 +40167,7 @@ var genreateDocAgnstCategory = function genreateDocAgnstCategory(data) {
           title: element.practitionerid.length > 0 ? element === null || element === void 0 ? void 0 : (_element$practitioner = element.practitionerid[0]) === null || _element$practitioner === void 0 ? void 0 : (_element$practitioner2 = _element$practitioner.practitioner_role) === null || _element$practitioner2 === void 0 ? void 0 : (_element$practitioner3 = _element$practitioner2[0]) === null || _element$practitioner3 === void 0 ? void 0 : (_element$practitioner4 = _element$practitioner3.role) === null || _element$practitioner4 === void 0 ? void 0 : (_element$practitioner5 = _element$practitioner4.coding[0]) === null || _element$practitioner5 === void 0 ? void 0 : _element$practitioner5.display : "",
           //title: "Role",
           date: utcTOLocal$1(element.updatedate, "MMMM Do  h:mm a"),
-          name: element.practitionerid.length > 0 ? makeName(((_element$practitioner6 = element.practitionerid[0]) === null || _element$practitioner6 === void 0 ? void 0 : _element$practitioner6.name[0]) || {}) : "Dummy"
+          name: element.practitionerid.length > 0 ? makeName$1(((_element$practitioner6 = element.practitionerid[0]) === null || _element$practitioner6 === void 0 ? void 0 : _element$practitioner6.name[0]) || {}) : "Dummy"
         }, element);
 
         var childObj = {
@@ -39651,7 +40195,7 @@ var genreateDocAgnstCategory = function genreateDocAgnstCategory(data) {
         var _userObj = _objectSpread2({
           title: element.practitionerid.length > 0 ? element === null || element === void 0 ? void 0 : (_element$practitioner7 = element.practitionerid[0]) === null || _element$practitioner7 === void 0 ? void 0 : (_element$practitioner8 = _element$practitioner7.practitioner_role) === null || _element$practitioner8 === void 0 ? void 0 : (_element$practitioner9 = _element$practitioner8[0]) === null || _element$practitioner9 === void 0 ? void 0 : (_element$practitioner10 = _element$practitioner9.role) === null || _element$practitioner10 === void 0 ? void 0 : (_element$practitioner11 = _element$practitioner10.coding[0]) === null || _element$practitioner11 === void 0 ? void 0 : _element$practitioner11.display : "",
           date: utcTOLocal$1(element.updatedate, "MMMM Do  h:mm:ss a"),
-          name: element.practitionerid.length > 0 ? makeName(((_element$practitioner12 = element.practitionerid[0]) === null || _element$practitioner12 === void 0 ? void 0 : _element$practitioner12.name[0]) || {}) : "Dummy"
+          name: element.practitionerid.length > 0 ? makeName$1(((_element$practitioner12 = element.practitionerid[0]) === null || _element$practitioner12 === void 0 ? void 0 : _element$practitioner12.name[0]) || {}) : "Dummy"
         }, element);
 
         var childObj = {
@@ -39676,7 +40220,7 @@ var generatePractitoner = function generatePractitoner(data) {
     var userObj = _objectSpread2({
       title: element.practitionerid.length > 0 ? element === null || element === void 0 ? void 0 : (_element$practitioner13 = element.practitionerid[0]) === null || _element$practitioner13 === void 0 ? void 0 : (_element$practitioner14 = _element$practitioner13.practitioner_role[0]) === null || _element$practitioner14 === void 0 ? void 0 : (_element$practitioner15 = _element$practitioner14.role) === null || _element$practitioner15 === void 0 ? void 0 : (_element$practitioner16 = _element$practitioner15.coding[0]) === null || _element$practitioner16 === void 0 ? void 0 : _element$practitioner16.display : "",
       date: utcTOLocal$1(element.updatedate, "MMMM Do  h:mm a"),
-      name: element.practitionerid.length > 0 ? makeName(((_element$practitioner17 = element.practitionerid[0]) === null || _element$practitioner17 === void 0 ? void 0 : _element$practitioner17.name[0]) || {}) : "Dummy"
+      name: element.practitionerid.length > 0 ? makeName$1(((_element$practitioner17 = element.practitionerid[0]) === null || _element$practitioner17 === void 0 ? void 0 : _element$practitioner17.name[0]) || {}) : "Dummy"
     }, element);
 
     arr.push(userObj);
@@ -40653,7 +41197,7 @@ var config$1 = [{
           _id: _id,
           id: id,
           value: _id,
-          label: makeName((name === null || name === void 0 ? void 0 : name[0]) || {}),
+          label: makeName$1((name === null || name === void 0 ? void 0 : name[0]) || {}),
           _key: _key
         };
       });
@@ -40885,12 +41429,21 @@ var highPriorityQueveQueries = {
       return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN TO_ARRAY(CodeableConceptMaster.coding) RETURN DOCUMENT(cod))})"
     };
   },
+  // reasonDropDown: () => {
+  //   return{
+  //     db_name: dbName,
+  //     entity: "ReasonMaster",
+  //     filter: "ReasonMaster.activestatus==true",
+  //     return_fields: "{_id:ReasonMaster._id,key:ReasonMaster._key,id:ReasonMaster.id,ReasonCode:ReasonMaster.ReasonCode,ReasonDesc:ReasonMaster.ReasonDesc}"
+  //   }
+  // }
   reasonDropDown: function reasonDropDown() {
     return {
-      db_name: dbName,
-      entity: "ReasonMaster",
-      filter: "ReasonMaster.activestatus==true",
-      return_fields: "{_id:ReasonMaster._id,key:ReasonMaster._key,id:ReasonMaster.id,ReasonCode:ReasonMaster.ReasonCode,ReasonDesc:ReasonMaster.ReasonDesc}"
+      "db_name": dbName,
+      "entity": "CodingMaster",
+      "filter": "CodingMaster.Type=='PRIORITYREASON' && CodingMaster.activestatus==true && CodingMaster.status==true",
+      "return_fields": "KEEP(CodingMaster,'_id','id','_key','code','display','Type')",
+      "Sort": "CodingMaster.Createddate"
     };
   }
 };
@@ -40986,8 +41539,11 @@ var PRIORITY_REASON_DROPDOWN = createAsyncThunk("highPriorityApiSlice/priorityRe
           data = _context2.sent;
           obj = [];
           data.result.map(function (val) {
+            var _val$display;
+
             obj.push({
-              value: val === null || val === void 0 ? void 0 : val.ReasonDesc,
+              // value:val?.ReasonDesc,
+              value: (_val$display = val === null || val === void 0 ? void 0 : val.display) !== null && _val$display !== void 0 ? _val$display : "",
               label: val === null || val === void 0 ? void 0 : val._id
             });
           });
@@ -41361,7 +41917,7 @@ var GET_APPOINTMENTS = createAsyncThunk("appointmentStatsApiSlice/getAppointment
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
               //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment = _.Appointment) === null || _$Appointment === void 0 ? void 0 : (_$Appointment$PersonI = _$Appointment.PersonID) === null || _$Appointment$PersonI === void 0 ? void 0 : (_$Appointment$PersonI2 = _$Appointment$PersonI[0]) === null || _$Appointment$PersonI2 === void 0 ? void 0 : (_$Appointment$PersonI3 = _$Appointment$PersonI2.name) === null || _$Appointment$PersonI3 === void 0 ? void 0 : _$Appointment$PersonI3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Appointment = _.Appointment) === null || _$Appointment === void 0 ? void 0 : (_$Appointment$PersonI = _$Appointment.PersonID) === null || _$Appointment$PersonI === void 0 ? void 0 : (_$Appointment$PersonI2 = _$Appointment$PersonI[0]) === null || _$Appointment$PersonI2 === void 0 ? void 0 : (_$Appointment$PersonI3 = _$Appointment$PersonI2.name) === null || _$Appointment$PersonI3 === void 0 ? void 0 : _$Appointment$PersonI3[0]) || {}),
               mrn: ((_$Appointment2 = _.Appointment) === null || _$Appointment2 === void 0 ? void 0 : (_$Appointment2$Person = _$Appointment2.PersonID) === null || _$Appointment2$Person === void 0 ? void 0 : (_$Appointment2$Person2 = _$Appointment2$Person[0]) === null || _$Appointment2$Person2 === void 0 ? void 0 : (_$Appointment2$Person3 = _$Appointment2$Person2.MRN) === null || _$Appointment2$Person3 === void 0 ? void 0 : _$Appointment2$Person3[0]) || "",
               // enId: _.Encounter.id,
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment3 = _.Appointment) === null || _$Appointment3 === void 0 ? void 0 : (_$Appointment3$Person = _$Appointment3.PersonID) === null || _$Appointment3$Person === void 0 ? void 0 : (_$Appointment3$Person2 = _$Appointment3$Person[0]) === null || _$Appointment3$Person2 === void 0 ? void 0 : _$Appointment3$Person2.birthDay),
@@ -41469,7 +42025,7 @@ var GET_FIRST_VISITS = createAsyncThunk("appointmentStatsApiSlice/getFirstVisits
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : (_$Appointment13$Perso = _$Appointment13.PersonID) === null || _$Appointment13$Perso === void 0 ? void 0 : (_$Appointment13$Perso2 = _$Appointment13$Perso[0]) === null || _$Appointment13$Perso2 === void 0 ? void 0 : _$Appointment13$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : _$Appointment14.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment15 = _.Appointment) === null || _$Appointment15 === void 0 ? void 0 : _$Appointment15.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment16 = _.Appointment) === null || _$Appointment16 === void 0 ? void 0 : _$Appointment16.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : _$Appointment17.start, "hh:mm A") : ""),
@@ -41573,7 +42129,7 @@ var GET_OTHER_VISITS = createAsyncThunk("appointmentStatsApiSlice/getOtherVisits
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$patient_ = _$Encounter9.patient_id) === null || _$Encounter9$patient_ === void 0 ? void 0 : (_$Encounter9$patient_2 = _$Encounter9$patient_[0]) === null || _$Encounter9$patient_2 === void 0 ? void 0 : _$Encounter9$patient_2.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : (_$Appointment20$Perso = _$Appointment20.PersonID) === null || _$Appointment20$Perso === void 0 ? void 0 : (_$Appointment20$Perso2 = _$Appointment20$Perso[0]) === null || _$Appointment20$Perso2 === void 0 ? void 0 : _$Appointment20$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : _$Appointment21.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : _$Appointment22.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : _$Appointment23.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment24 = _.Appointment) === null || _$Appointment24 === void 0 ? void 0 : _$Appointment24.start, "hh:mm A") : ""),
@@ -41677,7 +42233,7 @@ var GET_WALK_INS = createAsyncThunk("appointmentStatsApiSlice/getWalkIns", /*#__
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$patient = _$Encounter15.patient_id) === null || _$Encounter15$patient === void 0 ? void 0 : (_$Encounter15$patient2 = _$Encounter15$patient[0]) === null || _$Encounter15$patient2 === void 0 ? void 0 : (_$Encounter15$patient3 = _$Encounter15$patient2.name) === null || _$Encounter15$patient3 === void 0 ? void 0 : _$Encounter15$patient3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$patient = _$Encounter15.patient_id) === null || _$Encounter15$patient === void 0 ? void 0 : (_$Encounter15$patient2 = _$Encounter15$patient[0]) === null || _$Encounter15$patient2 === void 0 ? void 0 : (_$Encounter15$patient3 = _$Encounter15$patient2.name) === null || _$Encounter15$patient3 === void 0 ? void 0 : _$Encounter15$patient3[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$Encounter16 = _.Encounter) === null || _$Encounter16 === void 0 ? void 0 : (_$Encounter16$patient = _$Encounter16.patient_id) === null || _$Encounter16$patient === void 0 ? void 0 : (_$Encounter16$patient2 = _$Encounter16$patient[0]) === null || _$Encounter16$patient2 === void 0 ? void 0 : _$Encounter16$patient2.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : (_$Appointment27$Perso = _$Appointment27.PersonID) === null || _$Appointment27$Perso === void 0 ? void 0 : (_$Appointment27$Perso2 = _$Appointment27$Perso[0]) === null || _$Appointment27$Perso2 === void 0 ? void 0 : _$Appointment27$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : _$Appointment28.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : _$Appointment29.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment30 = _.Appointment) === null || _$Appointment30 === void 0 ? void 0 : _$Appointment30.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : _$Appointment31.start, "hh:mm A") : ""),
@@ -41781,7 +42337,7 @@ var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$patient = _$Encounter22.patient_id) === null || _$Encounter22$patient === void 0 ? void 0 : (_$Encounter22$patient2 = _$Encounter22$patient[0]) === null || _$Encounter22$patient2 === void 0 ? void 0 : (_$Encounter22$patient3 = _$Encounter22$patient2.name) === null || _$Encounter22$patient3 === void 0 ? void 0 : _$Encounter22$patient3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$patient = _$Encounter22.patient_id) === null || _$Encounter22$patient === void 0 ? void 0 : (_$Encounter22$patient2 = _$Encounter22$patient[0]) === null || _$Encounter22$patient2 === void 0 ? void 0 : (_$Encounter22$patient3 = _$Encounter22$patient2.name) === null || _$Encounter22$patient3 === void 0 ? void 0 : _$Encounter22$patient3[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$Encounter23 = _.Encounter) === null || _$Encounter23 === void 0 ? void 0 : (_$Encounter23$patient = _$Encounter23.patient_id) === null || _$Encounter23$patient === void 0 ? void 0 : (_$Encounter23$patient2 = _$Encounter23$patient[0]) === null || _$Encounter23$patient2 === void 0 ? void 0 : _$Encounter23$patient2.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : (_$Appointment34$Perso = _$Appointment34.PersonID) === null || _$Appointment34$Perso === void 0 ? void 0 : (_$Appointment34$Perso2 = _$Appointment34$Perso[0]) === null || _$Appointment34$Perso2 === void 0 ? void 0 : _$Appointment34$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : _$Appointment36.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : _$Appointment37.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : _$Appointment38.start, "hh:mm A") : ""),
@@ -41886,7 +42442,7 @@ var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$patient = _$Encounter29.patient_id) === null || _$Encounter29$patient === void 0 ? void 0 : (_$Encounter29$patient2 = _$Encounter29$patient[0]) === null || _$Encounter29$patient2 === void 0 ? void 0 : (_$Encounter29$patient3 = _$Encounter29$patient2.name) === null || _$Encounter29$patient3 === void 0 ? void 0 : _$Encounter29$patient3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$patient = _$Encounter29.patient_id) === null || _$Encounter29$patient === void 0 ? void 0 : (_$Encounter29$patient2 = _$Encounter29$patient[0]) === null || _$Encounter29$patient2 === void 0 ? void 0 : (_$Encounter29$patient3 = _$Encounter29$patient2.name) === null || _$Encounter29$patient3 === void 0 ? void 0 : _$Encounter29$patient3[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$patient = _$Encounter30.patient_id) === null || _$Encounter30$patient === void 0 ? void 0 : (_$Encounter30$patient2 = _$Encounter30$patient[0]) === null || _$Encounter30$patient2 === void 0 ? void 0 : _$Encounter30$patient2.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : (_$Appointment41$Perso = _$Appointment41.PersonID) === null || _$Appointment41$Perso === void 0 ? void 0 : (_$Appointment41$Perso2 = _$Appointment41$Perso[0]) === null || _$Appointment41$Perso2 === void 0 ? void 0 : _$Appointment41$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment42 = _.Appointment) === null || _$Appointment42 === void 0 ? void 0 : _$Appointment42.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : _$Appointment43.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : _$Appointment44.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : _$Appointment45.start, "hh:mm A") : ""),
@@ -41967,7 +42523,7 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
               //     _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
               //   )
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment48 = _.Appointment) === null || _$Appointment48 === void 0 ? void 0 : (_$Appointment48$Perso = _$Appointment48.PersonID) === null || _$Appointment48$Perso === void 0 ? void 0 : (_$Appointment48$Perso2 = _$Appointment48$Perso[0]) === null || _$Appointment48$Perso2 === void 0 ? void 0 : (_$Appointment48$Perso3 = _$Appointment48$Perso2.name) === null || _$Appointment48$Perso3 === void 0 ? void 0 : _$Appointment48$Perso3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Appointment48 = _.Appointment) === null || _$Appointment48 === void 0 ? void 0 : (_$Appointment48$Perso = _$Appointment48.PersonID) === null || _$Appointment48$Perso === void 0 ? void 0 : (_$Appointment48$Perso2 = _$Appointment48$Perso[0]) === null || _$Appointment48$Perso2 === void 0 ? void 0 : (_$Appointment48$Perso3 = _$Appointment48$Perso2.name) === null || _$Appointment48$Perso3 === void 0 ? void 0 : _$Appointment48$Perso3[0]) || {}),
               mrn: ((_$Appointment49 = _.Appointment) === null || _$Appointment49 === void 0 ? void 0 : (_$Appointment49$Perso = _$Appointment49.PersonID) === null || _$Appointment49$Perso === void 0 ? void 0 : (_$Appointment49$Perso2 = _$Appointment49$Perso[0]) === null || _$Appointment49$Perso2 === void 0 ? void 0 : (_$Appointment49$Perso3 = _$Appointment49$Perso2.MRN) === null || _$Appointment49$Perso3 === void 0 ? void 0 : _$Appointment49$Perso3[0]) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment50 = _.Appointment) === null || _$Appointment50 === void 0 ? void 0 : (_$Appointment50$Perso = _$Appointment50.PersonID) === null || _$Appointment50$Perso === void 0 ? void 0 : (_$Appointment50$Perso2 = _$Appointment50$Perso[0]) === null || _$Appointment50$Perso2 === void 0 ? void 0 : _$Appointment50$Perso2.birthDay),
               // genderData: "M",
@@ -41984,7 +42540,7 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
               // }),
               // clinic: _?.practitioner_details?.[0]?.clinic || "",
               visitType: (_$Encounter$0$visit_t = _ === null || _ === void 0 ? void 0 : (_$Encounter36 = _.Encounter) === null || _$Encounter36 === void 0 ? void 0 : (_$Encounter36$ = _$Encounter36[0]) === null || _$Encounter36$ === void 0 ? void 0 : _$Encounter36$.visit_type) !== null && _$Encounter$0$visit_t !== void 0 ? _$Encounter$0$visit_t : "",
-              practitionerName: makeName(_ === null || _ === void 0 ? void 0 : (_$Appointment58 = _.Appointment) === null || _$Appointment58 === void 0 ? void 0 : (_$Appointment58$resou = _$Appointment58.resourcecode) === null || _$Appointment58$resou === void 0 ? void 0 : _$Appointment58$resou.name),
+              practitionerName: makeName$1(_ === null || _ === void 0 ? void 0 : (_$Appointment58 = _.Appointment) === null || _$Appointment58 === void 0 ? void 0 : (_$Appointment58$resou = _$Appointment58.resourcecode) === null || _$Appointment58$resou === void 0 ? void 0 : _$Appointment58$resou.name),
               speciality: (_ === null || _ === void 0 ? void 0 : (_$Appointment59 = _.Appointment) === null || _$Appointment59 === void 0 ? void 0 : (_$Appointment59$Speci = _$Appointment59.SpecialtyID) === null || _$Appointment59$Speci === void 0 ? void 0 : (_$Appointment59$Speci2 = _$Appointment59$Speci[0]) === null || _$Appointment59$Speci2 === void 0 ? void 0 : (_$Appointment59$Speci3 = _$Appointment59$Speci2.coding) === null || _$Appointment59$Speci3 === void 0 ? void 0 : (_$Appointment59$Speci4 = _$Appointment59$Speci3[0]) === null || _$Appointment59$Speci4 === void 0 ? void 0 : _$Appointment59$Speci4.display) || "",
               clinic: (_ === null || _ === void 0 ? void 0 : (_$Appointment60 = _.Appointment) === null || _$Appointment60 === void 0 ? void 0 : (_$Appointment60$orgid = _$Appointment60.orgid) === null || _$Appointment60$orgid === void 0 ? void 0 : _$Appointment60$orgid.name) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment61 = _.Appointment) === null || _$Appointment61 === void 0 ? void 0 : _$Appointment61.appstatus) || "",
@@ -42078,7 +42634,7 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
               // // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id ?? "",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.alias) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$ = _$appointmentId[0]) === null || _$appointmentId$ === void 0 ? void 0 : (_$appointmentId$$Pers = _$appointmentId$.PersonID) === null || _$appointmentId$$Pers === void 0 ? void 0 : (_$appointmentId$$Pers2 = _$appointmentId$$Pers[0]) === null || _$appointmentId$$Pers2 === void 0 ? void 0 : _$appointmentId$$Pers2.birthDay),
               contact: (_$patient_id$0$teleco = _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : (_$patient_id3$$teleco = _$patient_id3$.telecom) === null || _$patient_id3$$teleco === void 0 ? void 0 : (_$patient_id3$$teleco2 = _$patient_id3$$teleco[0]) === null || _$patient_id3$$teleco2 === void 0 ? void 0 : _$patient_id3$$teleco2.value) !== null && _$patient_id$0$teleco !== void 0 ? _$patient_id$0$teleco : "",
@@ -42189,7 +42745,7 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id4 = _.patient_id) === null || _$patient_id4 === void 0 ? void 0 : (_$patient_id4$ = _$patient_id4[0]) === null || _$patient_id4$ === void 0 ? void 0 : (_$patient_id4$$name = _$patient_id4$.name) === null || _$patient_id4$$name === void 0 ? void 0 : _$patient_id4$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id4 = _.patient_id) === null || _$patient_id4 === void 0 ? void 0 : (_$patient_id4$ = _$patient_id4[0]) === null || _$patient_id4$ === void 0 ? void 0 : (_$patient_id4$$name = _$patient_id4$.name) === null || _$patient_id4$$name === void 0 ? void 0 : _$patient_id4$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : (_$patient_id5$ = _$patient_id5[0]) === null || _$patient_id5$ === void 0 ? void 0 : _$patient_id5$.alias) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : (_$appointmentId8$$Per = _$appointmentId8$.PersonID) === null || _$appointmentId8$$Per === void 0 ? void 0 : (_$appointmentId8$$Per2 = _$appointmentId8$$Per[0]) === null || _$appointmentId8$$Per2 === void 0 ? void 0 : _$appointmentId8$$Per2.birthDay),
               contact: (_$patient_id$0$teleco2 = _ === null || _ === void 0 ? void 0 : (_$patient_id6 = _.patient_id) === null || _$patient_id6 === void 0 ? void 0 : (_$patient_id6$ = _$patient_id6[0]) === null || _$patient_id6$ === void 0 ? void 0 : (_$patient_id6$$teleco = _$patient_id6$.telecom) === null || _$patient_id6$$teleco === void 0 ? void 0 : (_$patient_id6$$teleco2 = _$patient_id6$$teleco[0]) === null || _$patient_id6$$teleco2 === void 0 ? void 0 : _$patient_id6$$teleco2.value) !== null && _$patient_id$0$teleco2 !== void 0 ? _$patient_id$0$teleco2 : "",
@@ -42300,7 +42856,7 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id8 = _.patient_id) === null || _$patient_id8 === void 0 ? void 0 : (_$patient_id8$ = _$patient_id8[0]) === null || _$patient_id8$ === void 0 ? void 0 : _$patient_id8$.alias) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : (_$appointmentId15$$Pe = _$appointmentId15$.PersonID) === null || _$appointmentId15$$Pe === void 0 ? void 0 : (_$appointmentId15$$Pe2 = _$appointmentId15$$Pe[0]) === null || _$appointmentId15$$Pe2 === void 0 ? void 0 : _$appointmentId15$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : (_$patient_id9$$teleco = _$patient_id9$.telecom) === null || _$patient_id9$$teleco === void 0 ? void 0 : (_$patient_id9$$teleco2 = _$patient_id9$$teleco[0]) === null || _$patient_id9$$teleco2 === void 0 ? void 0 : _$patient_id9$$teleco2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : (_$patient_id10$ = _$patient_id10[0]) === null || _$patient_id10$ === void 0 ? void 0 : (_$patient_id10$$telec = _$patient_id10$.telecom) === null || _$patient_id10$$telec === void 0 ? void 0 : (_$patient_id10$$telec2 = _$patient_id10$$telec[0]) === null || _$patient_id10$$telec2 === void 0 ? void 0 : _$patient_id10$$telec2.value) : "",
@@ -42408,7 +42964,7 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id11 = _.patient_id) === null || _$patient_id11 === void 0 ? void 0 : (_$patient_id11$ = _$patient_id11[0]) === null || _$patient_id11$ === void 0 ? void 0 : (_$patient_id11$$name = _$patient_id11$.name) === null || _$patient_id11$$name === void 0 ? void 0 : _$patient_id11$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id11 = _.patient_id) === null || _$patient_id11 === void 0 ? void 0 : (_$patient_id11$ = _$patient_id11[0]) === null || _$patient_id11$ === void 0 ? void 0 : (_$patient_id11$$name = _$patient_id11$.name) === null || _$patient_id11$$name === void 0 ? void 0 : _$patient_id11$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id12 = _.patient_id) === null || _$patient_id12 === void 0 ? void 0 : (_$patient_id12$ = _$patient_id12[0]) === null || _$patient_id12$ === void 0 ? void 0 : _$patient_id12$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId22 = _.appointmentId) === null || _$appointmentId22 === void 0 ? void 0 : (_$appointmentId22$ = _$appointmentId22[0]) === null || _$appointmentId22$ === void 0 ? void 0 : (_$appointmentId22$$Pe = _$appointmentId22$.PersonID) === null || _$appointmentId22$$Pe === void 0 ? void 0 : (_$appointmentId22$$Pe2 = _$appointmentId22$$Pe[0]) === null || _$appointmentId22$$Pe2 === void 0 ? void 0 : _$appointmentId22$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$telec = _$patient_id13$.telecom) === null || _$patient_id13$$telec === void 0 ? void 0 : (_$patient_id13$$telec2 = _$patient_id13$$telec[0]) === null || _$patient_id13$$telec2 === void 0 ? void 0 : _$patient_id13$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : (_$patient_id14$$telec = _$patient_id14$.telecom) === null || _$patient_id14$$telec === void 0 ? void 0 : (_$patient_id14$$telec2 = _$patient_id14$$telec[0]) === null || _$patient_id14$$telec2 === void 0 ? void 0 : _$patient_id14$$telec2.value) : "",
@@ -42514,7 +43070,7 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : (_$patient_id15$$name = _$patient_id15$.name) === null || _$patient_id15$$name === void 0 ? void 0 : _$patient_id15$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : (_$patient_id15$$name = _$patient_id15$.name) === null || _$patient_id15$$name === void 0 ? void 0 : _$patient_id15$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id16 = _.patient_id) === null || _$patient_id16 === void 0 ? void 0 : (_$patient_id16$ = _$patient_id16[0]) === null || _$patient_id16$ === void 0 ? void 0 : _$patient_id16$.alias) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : (_$appointmentId29$$Pe = _$appointmentId29$.PersonID) === null || _$appointmentId29$$Pe === void 0 ? void 0 : (_$appointmentId29$$Pe2 = _$appointmentId29$$Pe[0]) === null || _$appointmentId29$$Pe2 === void 0 ? void 0 : _$appointmentId29$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : (_$patient_id17$$telec = _$patient_id17$.telecom) === null || _$patient_id17$$telec === void 0 ? void 0 : (_$patient_id17$$telec2 = _$patient_id17$$telec[0]) === null || _$patient_id17$$telec2 === void 0 ? void 0 : _$patient_id17$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id18 = _.patient_id) === null || _$patient_id18 === void 0 ? void 0 : (_$patient_id18$ = _$patient_id18[0]) === null || _$patient_id18$ === void 0 ? void 0 : (_$patient_id18$$telec = _$patient_id18$.telecom) === null || _$patient_id18$$telec === void 0 ? void 0 : (_$patient_id18$$telec2 = _$patient_id18$$telec[0]) === null || _$patient_id18$$telec2 === void 0 ? void 0 : _$patient_id18$$telec2.value) : "",
@@ -42601,7 +43157,7 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
               //   // genderData: "M",
               //   contact: _.Appointment?.PersonID?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment62 = _.Appointment) === null || _$Appointment62 === void 0 ? void 0 : (_$Appointment62$Perso = _$Appointment62.PersonID) === null || _$Appointment62$Perso === void 0 ? void 0 : (_$Appointment62$Perso2 = _$Appointment62$Perso[0]) === null || _$Appointment62$Perso2 === void 0 ? void 0 : (_$Appointment62$Perso3 = _$Appointment62$Perso2.name) === null || _$Appointment62$Perso3 === void 0 ? void 0 : _$Appointment62$Perso3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Appointment62 = _.Appointment) === null || _$Appointment62 === void 0 ? void 0 : (_$Appointment62$Perso = _$Appointment62.PersonID) === null || _$Appointment62$Perso === void 0 ? void 0 : (_$Appointment62$Perso2 = _$Appointment62$Perso[0]) === null || _$Appointment62$Perso2 === void 0 ? void 0 : (_$Appointment62$Perso3 = _$Appointment62$Perso2.name) === null || _$Appointment62$Perso3 === void 0 ? void 0 : _$Appointment62$Perso3[0]) || {}),
               mrn: ((_$Appointment63 = _.Appointment) === null || _$Appointment63 === void 0 ? void 0 : (_$Appointment63$Perso = _$Appointment63.PersonID) === null || _$Appointment63$Perso === void 0 ? void 0 : (_$Appointment63$Perso2 = _$Appointment63$Perso[0]) === null || _$Appointment63$Perso2 === void 0 ? void 0 : (_$Appointment63$Perso3 = _$Appointment63$Perso2.MRN) === null || _$Appointment63$Perso3 === void 0 ? void 0 : _$Appointment63$Perso3[0]) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment64 = _.Appointment) === null || _$Appointment64 === void 0 ? void 0 : (_$Appointment64$Perso = _$Appointment64.PersonID) === null || _$Appointment64$Perso === void 0 ? void 0 : (_$Appointment64$Perso2 = _$Appointment64$Perso[0]) === null || _$Appointment64$Perso2 === void 0 ? void 0 : _$Appointment64$Perso2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$Appointment65 = _.Appointment) === null || _$Appointment65 === void 0 ? void 0 : (_$Appointment65$Perso = _$Appointment65.PersonID) === null || _$Appointment65$Perso === void 0 ? void 0 : (_$Appointment65$Perso2 = _$Appointment65$Perso[0]) === null || _$Appointment65$Perso2 === void 0 ? void 0 : (_$Appointment65$Perso3 = _$Appointment65$Perso2.telecom) === null || _$Appointment65$Perso3 === void 0 ? void 0 : (_$Appointment65$Perso4 = _$Appointment65$Perso3[0]) === null || _$Appointment65$Perso4 === void 0 ? void 0 : _$Appointment65$Perso4.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Appointment66 = _.Appointment) === null || _$Appointment66 === void 0 ? void 0 : (_$Appointment66$Perso = _$Appointment66.PersonID) === null || _$Appointment66$Perso === void 0 ? void 0 : (_$Appointment66$Perso2 = _$Appointment66$Perso[0]) === null || _$Appointment66$Perso2 === void 0 ? void 0 : (_$Appointment66$Perso3 = _$Appointment66$Perso2.telecom) === null || _$Appointment66$Perso3 === void 0 ? void 0 : (_$Appointment66$Perso4 = _$Appointment66$Perso3[0]) === null || _$Appointment66$Perso4 === void 0 ? void 0 : _$Appointment66$Perso4.value) : "",
@@ -42626,7 +43182,7 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
               //   }).join(", ") ?? "",
               //   clinic: _?.Appointment?.orgid?.name ?? ""
               // }),
-              practitionerName: makeName(_ === null || _ === void 0 ? void 0 : (_$Appointment72 = _.Appointment) === null || _$Appointment72 === void 0 ? void 0 : (_$Appointment72$resou = _$Appointment72.resourcecode) === null || _$Appointment72$resou === void 0 ? void 0 : _$Appointment72$resou.name),
+              practitionerName: makeName$1(_ === null || _ === void 0 ? void 0 : (_$Appointment72 = _.Appointment) === null || _$Appointment72 === void 0 ? void 0 : (_$Appointment72$resou = _$Appointment72.resourcecode) === null || _$Appointment72$resou === void 0 ? void 0 : _$Appointment72$resou.name),
               speciality: (_ === null || _ === void 0 ? void 0 : (_$Appointment73 = _.Appointment) === null || _$Appointment73 === void 0 ? void 0 : (_$Appointment73$Speci = _$Appointment73.SpecialtyID) === null || _$Appointment73$Speci === void 0 ? void 0 : (_$Appointment73$Speci2 = _$Appointment73$Speci[0]) === null || _$Appointment73$Speci2 === void 0 ? void 0 : (_$Appointment73$Speci3 = _$Appointment73$Speci2.coding) === null || _$Appointment73$Speci3 === void 0 ? void 0 : (_$Appointment73$Speci4 = _$Appointment73$Speci3[0]) === null || _$Appointment73$Speci4 === void 0 ? void 0 : _$Appointment73$Speci4.display) || "",
               clinic: (_ === null || _ === void 0 ? void 0 : (_$Appointment74 = _.Appointment) === null || _$Appointment74 === void 0 ? void 0 : (_$Appointment74$orgid = _$Appointment74.orgid) === null || _$Appointment74$orgid === void 0 ? void 0 : _$Appointment74$orgid.name) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment75 = _.Appointment) === null || _$Appointment75 === void 0 ? void 0 : _$Appointment75.appstatus) || "",
@@ -42725,7 +43281,7 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id19 = _.patient_id) === null || _$patient_id19 === void 0 ? void 0 : (_$patient_id19$ = _$patient_id19[0]) === null || _$patient_id19$ === void 0 ? void 0 : (_$patient_id19$$name = _$patient_id19$.name) === null || _$patient_id19$$name === void 0 ? void 0 : _$patient_id19$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id19 = _.patient_id) === null || _$patient_id19 === void 0 ? void 0 : (_$patient_id19$ = _$patient_id19[0]) === null || _$patient_id19$ === void 0 ? void 0 : (_$patient_id19$$name = _$patient_id19$.name) === null || _$patient_id19$$name === void 0 ? void 0 : _$patient_id19$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id20 = _.patient_id) === null || _$patient_id20 === void 0 ? void 0 : (_$patient_id20$ = _$patient_id20[0]) === null || _$patient_id20$ === void 0 ? void 0 : _$patient_id20$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : (_$appointmentId36$$Pe = _$appointmentId36$.PersonID) === null || _$appointmentId36$$Pe === void 0 ? void 0 : (_$appointmentId36$$Pe2 = _$appointmentId36$$Pe[0]) === null || _$appointmentId36$$Pe2 === void 0 ? void 0 : _$appointmentId36$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id21 = _.patient_id) === null || _$patient_id21 === void 0 ? void 0 : (_$patient_id21$ = _$patient_id21[0]) === null || _$patient_id21$ === void 0 ? void 0 : (_$patient_id21$$telec = _$patient_id21$.telecom) === null || _$patient_id21$$telec === void 0 ? void 0 : (_$patient_id21$$telec2 = _$patient_id21$$telec[0]) === null || _$patient_id21$$telec2 === void 0 ? void 0 : _$patient_id21$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id22 = _.patient_id) === null || _$patient_id22 === void 0 ? void 0 : (_$patient_id22$ = _$patient_id22[0]) === null || _$patient_id22$ === void 0 ? void 0 : (_$patient_id22$$telec = _$patient_id22$.telecom) === null || _$patient_id22$$telec === void 0 ? void 0 : (_$patient_id22$$telec2 = _$patient_id22$$telec[0]) === null || _$patient_id22$$telec2 === void 0 ? void 0 : _$patient_id22$$telec2.value) : "",
@@ -42836,7 +43392,7 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : (_$patient_id23$$name = _$patient_id23$.name) === null || _$patient_id23$$name === void 0 ? void 0 : _$patient_id23$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : (_$patient_id23$$name = _$patient_id23$.name) === null || _$patient_id23$$name === void 0 ? void 0 : _$patient_id23$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id24 = _.patient_id) === null || _$patient_id24 === void 0 ? void 0 : (_$patient_id24$ = _$patient_id24[0]) === null || _$patient_id24$ === void 0 ? void 0 : _$patient_id24$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : (_$appointmentId42$$Pe = _$appointmentId42$.PersonID) === null || _$appointmentId42$$Pe === void 0 ? void 0 : (_$appointmentId42$$Pe2 = _$appointmentId42$$Pe[0]) === null || _$appointmentId42$$Pe2 === void 0 ? void 0 : _$appointmentId42$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : (_$patient_id25$$telec = _$patient_id25$.telecom) === null || _$patient_id25$$telec === void 0 ? void 0 : (_$patient_id25$$telec2 = _$patient_id25$$telec[0]) === null || _$patient_id25$$telec2 === void 0 ? void 0 : _$patient_id25$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : (_$patient_id26$$telec = _$patient_id26$.telecom) === null || _$patient_id26$$telec === void 0 ? void 0 : (_$patient_id26$$telec2 = _$patient_id26$$telec[0]) === null || _$patient_id26$$telec2 === void 0 ? void 0 : _$patient_id26$$telec2.value) : "",
@@ -42946,7 +43502,7 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : (_$patient_id27$$name = _$patient_id27$.name) === null || _$patient_id27$$name === void 0 ? void 0 : _$patient_id27$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : (_$patient_id27$$name = _$patient_id27$.name) === null || _$patient_id27$$name === void 0 ? void 0 : _$patient_id27$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : _$patient_id28$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : (_$appointmentId48$$Pe = _$appointmentId48$.PersonID) === null || _$appointmentId48$$Pe === void 0 ? void 0 : (_$appointmentId48$$Pe2 = _$appointmentId48$$Pe[0]) === null || _$appointmentId48$$Pe2 === void 0 ? void 0 : _$appointmentId48$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id29 = _.patient_id) === null || _$patient_id29 === void 0 ? void 0 : (_$patient_id29$ = _$patient_id29[0]) === null || _$patient_id29$ === void 0 ? void 0 : (_$patient_id29$$telec = _$patient_id29$.telecom) === null || _$patient_id29$$telec === void 0 ? void 0 : (_$patient_id29$$telec2 = _$patient_id29$$telec[0]) === null || _$patient_id29$$telec2 === void 0 ? void 0 : _$patient_id29$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id30 = _.patient_id) === null || _$patient_id30 === void 0 ? void 0 : (_$patient_id30$ = _$patient_id30[0]) === null || _$patient_id30$ === void 0 ? void 0 : (_$patient_id30$$telec = _$patient_id30$.telecom) === null || _$patient_id30$$telec === void 0 ? void 0 : (_$patient_id30$$telec2 = _$patient_id30$$telec[0]) === null || _$patient_id30$$telec2 === void 0 ? void 0 : _$patient_id30$$telec2.value) : "",
@@ -43056,7 +43612,7 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : (_$patient_id31$$name = _$patient_id31$.name) === null || _$patient_id31$$name === void 0 ? void 0 : _$patient_id31$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : (_$patient_id31$$name = _$patient_id31$.name) === null || _$patient_id31$$name === void 0 ? void 0 : _$patient_id31$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id32 = _.patient_id) === null || _$patient_id32 === void 0 ? void 0 : (_$patient_id32$ = _$patient_id32[0]) === null || _$patient_id32$ === void 0 ? void 0 : _$patient_id32$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId54 = _.appointmentId) === null || _$appointmentId54 === void 0 ? void 0 : (_$appointmentId54$ = _$appointmentId54[0]) === null || _$appointmentId54$ === void 0 ? void 0 : (_$appointmentId54$$Pe = _$appointmentId54$.PersonID) === null || _$appointmentId54$$Pe === void 0 ? void 0 : (_$appointmentId54$$Pe2 = _$appointmentId54$$Pe[0]) === null || _$appointmentId54$$Pe2 === void 0 ? void 0 : _$appointmentId54$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id33 = _.patient_id) === null || _$patient_id33 === void 0 ? void 0 : (_$patient_id33$ = _$patient_id33[0]) === null || _$patient_id33$ === void 0 ? void 0 : (_$patient_id33$$telec = _$patient_id33$.telecom) === null || _$patient_id33$$telec === void 0 ? void 0 : (_$patient_id33$$telec2 = _$patient_id33$$telec[0]) === null || _$patient_id33$$telec2 === void 0 ? void 0 : _$patient_id33$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id34 = _.patient_id) === null || _$patient_id34 === void 0 ? void 0 : (_$patient_id34$ = _$patient_id34[0]) === null || _$patient_id34$ === void 0 ? void 0 : (_$patient_id34$$telec = _$patient_id34$.telecom) === null || _$patient_id34$$telec === void 0 ? void 0 : (_$patient_id34$$telec2 = _$patient_id34$$telec[0]) === null || _$patient_id34$$telec2 === void 0 ? void 0 : _$patient_id34$$telec2.value) : "",
@@ -43166,7 +43722,7 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
               //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : (_$patient_id35$ = _$patient_id35[0]) === null || _$patient_id35$ === void 0 ? void 0 : (_$patient_id35$$name = _$patient_id35$.name) === null || _$patient_id35$$name === void 0 ? void 0 : _$patient_id35$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : (_$patient_id35$ = _$patient_id35[0]) === null || _$patient_id35$ === void 0 ? void 0 : (_$patient_id35$$name = _$patient_id35$.name) === null || _$patient_id35$$name === void 0 ? void 0 : _$patient_id35$$name[0]) || {}),
               mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id36 = _.patient_id) === null || _$patient_id36 === void 0 ? void 0 : (_$patient_id36$ = _$patient_id36[0]) === null || _$patient_id36$ === void 0 ? void 0 : _$patient_id36$.MRN) || "",
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : (_$appointmentId60$$Pe = _$appointmentId60$.PersonID) === null || _$appointmentId60$$Pe === void 0 ? void 0 : (_$appointmentId60$$Pe2 = _$appointmentId60$$Pe[0]) === null || _$appointmentId60$$Pe2 === void 0 ? void 0 : _$appointmentId60$$Pe2.birthDay),
               contact: (_ === null || _ === void 0 ? void 0 : (_$patient_id37 = _.patient_id) === null || _$patient_id37 === void 0 ? void 0 : (_$patient_id37$ = _$patient_id37[0]) === null || _$patient_id37$ === void 0 ? void 0 : (_$patient_id37$$telec = _$patient_id37$.telecom) === null || _$patient_id37$$telec === void 0 ? void 0 : (_$patient_id37$$telec2 = _$patient_id37$$telec[0]) === null || _$patient_id37$$telec2 === void 0 ? void 0 : _$patient_id37$$telec2.value) ? JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id38 = _.patient_id) === null || _$patient_id38 === void 0 ? void 0 : (_$patient_id38$ = _$patient_id38[0]) === null || _$patient_id38$ === void 0 ? void 0 : (_$patient_id38$$telec = _$patient_id38$.telecom) === null || _$patient_id38$$telec === void 0 ? void 0 : (_$patient_id38$$telec2 = _$patient_id38$$telec[0]) === null || _$patient_id38$$telec2 === void 0 ? void 0 : _$patient_id38$$telec2.value) : "",
@@ -44173,7 +44729,7 @@ var DAY_BASED_PRACTITIONER_LIST = createAsyncThunk("dayEndProcessSlice/dayBasedP
           arr = data.result.map(function (val) {
             var _val$encounterid, _val$encounterid$pati, _val$encounterid$pati2, _val$encounterid$pati3, _val$appointmentid, _val$appointmentid$Pa, _val$appointmentid$Pa2, _val$appointmentid$Pa3, _val$appointmentid2, _val$appointmentid2$P, _val$appointmentid2$P2, _val$appointmentid2$P3, _val$encounterid2, _val$encounterid2$pat, _val$encounterid2$pat2, _val$appointmentid3, _val$appointmentid3$P, _val$appointmentid3$P2, _val$encounterid3, _val$encounterid3$pat, _val$encounterid3$pat2, _val$appointmentid4, _val$appointmentid4$P, _val$appointmentid4$P2, _val$appointmentid5, _val$appointmentid5$P, _val$appointmentid5$P2, _val$appointmentid6, _val$encounterid4, _val$encounterid5, _val$appointmentid7;
 
-            var name = makeName(val === null || val === void 0 ? void 0 : (_val$encounterid = val.encounterid) === null || _val$encounterid === void 0 ? void 0 : (_val$encounterid$pati = _val$encounterid.patient_id) === null || _val$encounterid$pati === void 0 ? void 0 : (_val$encounterid$pati2 = _val$encounterid$pati[0]) === null || _val$encounterid$pati2 === void 0 ? void 0 : (_val$encounterid$pati3 = _val$encounterid$pati2.name) === null || _val$encounterid$pati3 === void 0 ? void 0 : _val$encounterid$pati3[0]) || makeName(val === null || val === void 0 ? void 0 : (_val$appointmentid = val.appointmentid) === null || _val$appointmentid === void 0 ? void 0 : (_val$appointmentid$Pa = _val$appointmentid.PatientID) === null || _val$appointmentid$Pa === void 0 ? void 0 : (_val$appointmentid$Pa2 = _val$appointmentid$Pa[0]) === null || _val$appointmentid$Pa2 === void 0 ? void 0 : (_val$appointmentid$Pa3 = _val$appointmentid$Pa2.name) === null || _val$appointmentid$Pa3 === void 0 ? void 0 : _val$appointmentid$Pa3[0]) || makeName(val === null || val === void 0 ? void 0 : (_val$appointmentid2 = val.appointmentid) === null || _val$appointmentid2 === void 0 ? void 0 : (_val$appointmentid2$P = _val$appointmentid2.Person) === null || _val$appointmentid2$P === void 0 ? void 0 : (_val$appointmentid2$P2 = _val$appointmentid2$P[0]) === null || _val$appointmentid2$P2 === void 0 ? void 0 : (_val$appointmentid2$P3 = _val$appointmentid2$P2.name) === null || _val$appointmentid2$P3 === void 0 ? void 0 : _val$appointmentid2$P3[0]);
+            var name = makeName$1(val === null || val === void 0 ? void 0 : (_val$encounterid = val.encounterid) === null || _val$encounterid === void 0 ? void 0 : (_val$encounterid$pati = _val$encounterid.patient_id) === null || _val$encounterid$pati === void 0 ? void 0 : (_val$encounterid$pati2 = _val$encounterid$pati[0]) === null || _val$encounterid$pati2 === void 0 ? void 0 : (_val$encounterid$pati3 = _val$encounterid$pati2.name) === null || _val$encounterid$pati3 === void 0 ? void 0 : _val$encounterid$pati3[0]) || makeName$1(val === null || val === void 0 ? void 0 : (_val$appointmentid = val.appointmentid) === null || _val$appointmentid === void 0 ? void 0 : (_val$appointmentid$Pa = _val$appointmentid.PatientID) === null || _val$appointmentid$Pa === void 0 ? void 0 : (_val$appointmentid$Pa2 = _val$appointmentid$Pa[0]) === null || _val$appointmentid$Pa2 === void 0 ? void 0 : (_val$appointmentid$Pa3 = _val$appointmentid$Pa2.name) === null || _val$appointmentid$Pa3 === void 0 ? void 0 : _val$appointmentid$Pa3[0]) || makeName$1(val === null || val === void 0 ? void 0 : (_val$appointmentid2 = val.appointmentid) === null || _val$appointmentid2 === void 0 ? void 0 : (_val$appointmentid2$P = _val$appointmentid2.Person) === null || _val$appointmentid2$P === void 0 ? void 0 : (_val$appointmentid2$P2 = _val$appointmentid2$P[0]) === null || _val$appointmentid2$P2 === void 0 ? void 0 : (_val$appointmentid2$P3 = _val$appointmentid2$P2.name) === null || _val$appointmentid2$P3 === void 0 ? void 0 : _val$appointmentid2$P3[0]);
             var MRN = (val === null || val === void 0 ? void 0 : (_val$encounterid2 = val.encounterid) === null || _val$encounterid2 === void 0 ? void 0 : (_val$encounterid2$pat = _val$encounterid2.patient_id) === null || _val$encounterid2$pat === void 0 ? void 0 : (_val$encounterid2$pat2 = _val$encounterid2$pat[0]) === null || _val$encounterid2$pat2 === void 0 ? void 0 : _val$encounterid2$pat2.MRN) || (val === null || val === void 0 ? void 0 : (_val$appointmentid3 = val.appointmentid) === null || _val$appointmentid3 === void 0 ? void 0 : (_val$appointmentid3$P = _val$appointmentid3.PatientID) === null || _val$appointmentid3$P === void 0 ? void 0 : (_val$appointmentid3$P2 = _val$appointmentid3$P[0]) === null || _val$appointmentid3$P2 === void 0 ? void 0 : _val$appointmentid3$P2.alias) || "----";
             var age = getAge(val === null || val === void 0 ? void 0 : (_val$encounterid3 = val.encounterid) === null || _val$encounterid3 === void 0 ? void 0 : (_val$encounterid3$pat = _val$encounterid3.patient_id) === null || _val$encounterid3$pat === void 0 ? void 0 : (_val$encounterid3$pat2 = _val$encounterid3$pat[0]) === null || _val$encounterid3$pat2 === void 0 ? void 0 : _val$encounterid3$pat2.birthDate) || getAge(val === null || val === void 0 ? void 0 : (_val$appointmentid4 = val.appointmentid) === null || _val$appointmentid4 === void 0 ? void 0 : (_val$appointmentid4$P = _val$appointmentid4.PatientID) === null || _val$appointmentid4$P === void 0 ? void 0 : (_val$appointmentid4$P2 = _val$appointmentid4$P[0]) === null || _val$appointmentid4$P2 === void 0 ? void 0 : _val$appointmentid4$P2.birthDate) || getAge(val === null || val === void 0 ? void 0 : (_val$appointmentid5 = val.appointmentid) === null || _val$appointmentid5 === void 0 ? void 0 : (_val$appointmentid5$P = _val$appointmentid5.Person) === null || _val$appointmentid5$P === void 0 ? void 0 : (_val$appointmentid5$P2 = _val$appointmentid5$P[0]) === null || _val$appointmentid5$P2 === void 0 ? void 0 : _val$appointmentid5$P2.birthDate);
             return {
@@ -44690,7 +45246,7 @@ var orderSetDropDown = {
 };
 
 var makeRadiologyData = function makeRadiologyData(order, info) {
-  var _order$ordercategory, _info$org_id, _info$patientId, _info$encounterType, _info$encounterId, _order$orderSetsCode, _order$name, _order$orderType$_id, _order$orderType, _order$orderNature, _order$priority, _moment$unix, _moment$unix2, _order$orderQty, _order$orderQtyUOM$_i, _order$orderQtyUOM, _info$status$value, _info$status, _order$freqValue, _order$freqValueUnit$, _order$freqValueUnit, _order$freqRate, _order$freqRateUnit$_, _order$freqRateUnit, _order$duration, _order$durationType$_, _order$durationType, _info$accessionNum, _order$IVDosDurValue, _order$IVDosDurUOM$_i, _order$IVDosDurUOM;
+  var _order$ordercategory, _info$org_id, _info$patientId, _info$encounterType, _info$encounterId, _order$orderSetsCode, _order$orderCatalog_i, _order$orderType$_id, _order$orderType, _order$orderNature, _order$priority, _moment$unix, _moment$unix2, _order$orderQty, _order$orderQtyUOM$_i, _order$orderQtyUOM, _info$status$value, _info$status, _order$freqValue, _order$freqValueUnit$, _order$freqValueUnit, _order$freqRate, _order$freqRateUnit$_, _order$freqRateUnit, _order$duration, _order$durationType$_, _order$durationType, _info$accessionNum, _order$IVDosDurValue, _order$IVDosDurUOM$_i, _order$IVDosDurUOM;
 
   return {
     db_name: dbName,
@@ -44707,7 +45263,8 @@ var makeRadiologyData = function makeRadiologyData(order, info) {
       encounter_Id: (_info$encounterId = info === null || info === void 0 ? void 0 : info.encounterId) !== null && _info$encounterId !== void 0 ? _info$encounterId : "",
       order_Id: "",
       orderSetCode: (_order$orderSetsCode = order === null || order === void 0 ? void 0 : order.orderSetsCode) !== null && _order$orderSetsCode !== void 0 ? _order$orderSetsCode : "",
-      orderCatalog: (_order$name = order === null || order === void 0 ? void 0 : order.name) !== null && _order$name !== void 0 ? _order$name : "",
+      // orderCatalog: order?.name ?? "",
+      orderCatalog: (_order$orderCatalog_i = order === null || order === void 0 ? void 0 : order.orderCatalog_id) !== null && _order$orderCatalog_i !== void 0 ? _order$orderCatalog_i : "",
       orderCategory: "",
       OrderType: (_order$orderType$_id = order === null || order === void 0 ? void 0 : (_order$orderType = order.orderType) === null || _order$orderType === void 0 ? void 0 : _order$orderType._id) !== null && _order$orderType$_id !== void 0 ? _order$orderType$_id : "",
       OrderNature: (_order$orderNature = order === null || order === void 0 ? void 0 : order.orderNature) !== null && _order$orderNature !== void 0 ? _order$orderNature : "",
@@ -44792,7 +45349,7 @@ var makeRadiologyData = function makeRadiologyData(order, info) {
 };
 
 var makeMedicationData = function makeMedicationData(order, info) {
-  var _info$org_id2, _info$patientId2, _info$encounterType2, _info$encounterId2, _order$drugType, _info$status$value2, _info$status2, _order$drugCode, _order$formCode, _order$routeCode, _order$dosageUOM$_id, _order$dosageUOM, _order$IVInfusRateVal, _order$IVInfusRateUOM, _order$IVInfusRateUOM2, _order$duration2, _order$durationType$_2, _order$durationType2, _order$name2, _moment$unix3, _order$notes, _order$practInstr, _order$IVDosDurValue2, _order$IVDosDurUOM$_i2, _order$IVDosDurUOM2;
+  var _info$org_id2, _info$patientId2, _info$encounterType2, _info$encounterId2, _order$drugType, _info$status$value2, _info$status2, _order$drugCode, _order$formCode, _order$routeCode, _order$dosageUOM$_id, _order$dosageUOM, _order$IVInfusRateVal, _order$IVInfusRateUOM, _order$IVInfusRateUOM2, _order$duration2, _order$durationType$_2, _order$durationType2, _order$name, _moment$unix3, _order$notes, _order$practInstr, _order$IVDosDurValue2, _order$IVDosDurUOM$_i2, _order$IVDosDurUOM2;
 
   return {
     db_name: dbName,
@@ -44830,7 +45387,7 @@ var makeMedicationData = function makeMedicationData(order, info) {
       ivInfusionRateUOM: (_order$IVInfusRateUOM = order === null || order === void 0 ? void 0 : (_order$IVInfusRateUOM2 = order.IVInfusRateUOM) === null || _order$IVInfusRateUOM2 === void 0 ? void 0 : _order$IVInfusRateUOM2._id) !== null && _order$IVInfusRateUOM !== void 0 ? _order$IVInfusRateUOM : "",
       dosageDurationValue: (_order$duration2 = order === null || order === void 0 ? void 0 : order.duration) !== null && _order$duration2 !== void 0 ? _order$duration2 : 0,
       dosageDurationUOM: (_order$durationType$_2 = order === null || order === void 0 ? void 0 : (_order$durationType2 = order.durationType) === null || _order$durationType2 === void 0 ? void 0 : _order$durationType2._id) !== null && _order$durationType$_2 !== void 0 ? _order$durationType$_2 : "",
-      orderdescription: (_order$name2 = order === null || order === void 0 ? void 0 : order.name) !== null && _order$name2 !== void 0 ? _order$name2 : "",
+      orderdescription: (_order$name = order === null || order === void 0 ? void 0 : order.name) !== null && _order$name !== void 0 ? _order$name : "",
       occurStartDateTime: (_moment$unix3 = moment$1().unix()) !== null && _moment$unix3 !== void 0 ? _moment$unix3 : 0,
       occurEndDateTime: 0,
       totPresQty: 0,
@@ -45036,7 +45593,7 @@ var PRACTITIONER_DROPDOWN = createAsyncThunk("orderSetApiSlice/practitionerDropD
           obj = data.result.map(function (val) {
             var _val$name;
 
-            var name = makeName((val === null || val === void 0 ? void 0 : (_val$name = val.name) === null || _val$name === void 0 ? void 0 : _val$name[0]) || {});
+            var name = makeName$1((val === null || val === void 0 ? void 0 : (_val$name = val.name) === null || _val$name === void 0 ? void 0 : _val$name[0]) || {});
             return {
               value: val === null || val === void 0 ? void 0 : val._id,
               label: name
@@ -45150,7 +45707,7 @@ var ORDER_SET_READ = createAsyncThunk("orderSetApiSlice/orderSetRead", /*#__PURE
             var data = [];
             var object = {};
             val === null || val === void 0 ? void 0 : (_val$components = val.components) === null || _val$components === void 0 ? void 0 : _val$components.forEach(function (v) {
-              var _v$ordercategory, _v$orderCatalog$longd, _v$orderCatalog, _v$orderCatalog2, _v$route, _v$orderCatalog3, _v$orderCatalog4, _v$orderCatalog5, _v$orderCatalog6, _v$orderCatalog7, _v$orderCatalog8, _v$route2, _v$orderCatalog9;
+              var _v$ordercategory, _v$orderCatalog$longd, _v$orderCatalog, _v$orderCatalog2, _v$orderCatalog$_id, _v$orderCatalog3, _v$orderCatalog4, _v$route, _v$orderCatalog5, _v$orderCatalog6, _v$orderCatalog7, _v$orderCatalog8, _v$orderCatalog9, _v$orderCatalog10, _v$route2, _v$orderCatalog11;
 
               var key = v === null || v === void 0 ? void 0 : (_v$ordercategory = v.ordercategory) === null || _v$ordercategory === void 0 ? void 0 : _v$ordercategory.longdesc;
 
@@ -45163,18 +45720,19 @@ var ORDER_SET_READ = createAsyncThunk("orderSetApiSlice/orderSetRead", /*#__PURE
                 parentSqNo: v === null || v === void 0 ? void 0 : v.parentCatSeqNo,
                 sqNo: v === null || v === void 0 ? void 0 : v.seqNo,
                 name: (_v$orderCatalog$longd = v === null || v === void 0 ? void 0 : (_v$orderCatalog = v.orderCatalog) === null || _v$orderCatalog === void 0 ? void 0 : _v$orderCatalog.longdesc) !== null && _v$orderCatalog$longd !== void 0 ? _v$orderCatalog$longd : v === null || v === void 0 ? void 0 : (_v$orderCatalog2 = v.orderCatalog) === null || _v$orderCatalog2 === void 0 ? void 0 : _v$orderCatalog2.LongDesc,
+                orderCatalog_id: (_v$orderCatalog$_id = v === null || v === void 0 ? void 0 : (_v$orderCatalog3 = v.orderCatalog) === null || _v$orderCatalog3 === void 0 ? void 0 : _v$orderCatalog3._id) !== null && _v$orderCatalog$_id !== void 0 ? _v$orderCatalog$_id : v === null || v === void 0 ? void 0 : (_v$orderCatalog4 = v.orderCatalog) === null || _v$orderCatalog4 === void 0 ? void 0 : _v$orderCatalog4._id,
                 dose: v === null || v === void 0 ? void 0 : (_v$route = v.route) === null || _v$route === void 0 ? void 0 : _v$route.shortdesc,
                 checked: false,
                 practInstr: v === null || v === void 0 ? void 0 : v.practInstr,
                 startDay: v === null || v === void 0 ? void 0 : v.startDay,
                 ordercategory: v === null || v === void 0 ? void 0 : v.ordercategory,
-                orderType: v === null || v === void 0 ? void 0 : (_v$orderCatalog3 = v.orderCatalog) === null || _v$orderCatalog3 === void 0 ? void 0 : _v$orderCatalog3.ordertype,
+                orderType: v === null || v === void 0 ? void 0 : (_v$orderCatalog5 = v.orderCatalog) === null || _v$orderCatalog5 === void 0 ? void 0 : _v$orderCatalog5.ordertype,
                 orderSetsCode: val === null || val === void 0 ? void 0 : val.orderSetCode,
                 priority: "",
                 orderNature: "",
                 orderQty: v === null || v === void 0 ? void 0 : v.dfltOrderQty,
                 orderQtyUOM: v === null || v === void 0 ? void 0 : v.dfltOrderUOM,
-                ordercatalog: v === null || v === void 0 ? void 0 : (_v$orderCatalog4 = v.orderCatalog) === null || _v$orderCatalog4 === void 0 ? void 0 : _v$orderCatalog4.ordercatalog,
+                ordercatalog: v === null || v === void 0 ? void 0 : (_v$orderCatalog6 = v.orderCatalog) === null || _v$orderCatalog6 === void 0 ? void 0 : _v$orderCatalog6.ordercatalog,
                 freqValue: v === null || v === void 0 ? void 0 : v.dfltFreqVal,
                 freqValueUnit: v === null || v === void 0 ? void 0 : v.dfltFreqValUnit,
                 freqRate: v === null || v === void 0 ? void 0 : v.dfltFreqRate,
@@ -45185,10 +45743,10 @@ var ORDER_SET_READ = createAsyncThunk("orderSetApiSlice/orderSetRead", /*#__PURE
                 IVDosDurValue: v === null || v === void 0 ? void 0 : v.IVDosDurValue,
                 _id: v === null || v === void 0 ? void 0 : v._id,
                 id: v === null || v === void 0 ? void 0 : v.id,
-                drugType: v === null || v === void 0 ? void 0 : (_v$orderCatalog5 = v.orderCatalog) === null || _v$orderCatalog5 === void 0 ? void 0 : _v$orderCatalog5.DrugType,
-                status: v === null || v === void 0 ? void 0 : (_v$orderCatalog6 = v.orderCatalog) === null || _v$orderCatalog6 === void 0 ? void 0 : _v$orderCatalog6.Status,
-                drugCode: v === null || v === void 0 ? void 0 : (_v$orderCatalog7 = v.orderCatalog) === null || _v$orderCatalog7 === void 0 ? void 0 : _v$orderCatalog7._id,
-                formCode: v === null || v === void 0 ? void 0 : (_v$orderCatalog8 = v.orderCatalog) === null || _v$orderCatalog8 === void 0 ? void 0 : _v$orderCatalog8.FormCode,
+                drugType: v === null || v === void 0 ? void 0 : (_v$orderCatalog7 = v.orderCatalog) === null || _v$orderCatalog7 === void 0 ? void 0 : _v$orderCatalog7.DrugType,
+                status: v === null || v === void 0 ? void 0 : (_v$orderCatalog8 = v.orderCatalog) === null || _v$orderCatalog8 === void 0 ? void 0 : _v$orderCatalog8.Status,
+                drugCode: v === null || v === void 0 ? void 0 : (_v$orderCatalog9 = v.orderCatalog) === null || _v$orderCatalog9 === void 0 ? void 0 : _v$orderCatalog9._id,
+                formCode: v === null || v === void 0 ? void 0 : (_v$orderCatalog10 = v.orderCatalog) === null || _v$orderCatalog10 === void 0 ? void 0 : _v$orderCatalog10.FormCode,
                 routeCode: v === null || v === void 0 ? void 0 : (_v$route2 = v.route) === null || _v$route2 === void 0 ? void 0 : _v$route2._id,
                 StrengthValuesPossible: v === null || v === void 0 ? void 0 : v.StrengthValuesPossible,
                 IVInfusRateUOM: v === null || v === void 0 ? void 0 : v.IVInfusRateUOM,
@@ -45196,7 +45754,7 @@ var ORDER_SET_READ = createAsyncThunk("orderSetApiSlice/orderSetRead", /*#__PURE
                 IVInfusRateVolUOM: v === null || v === void 0 ? void 0 : v.IVInfusRateVolUOM,
                 IVInfusRateVol: v === null || v === void 0 ? void 0 : v.IVInfusRateVol,
                 notes: v === null || v === void 0 ? void 0 : v.explNote,
-                DrugCategory: v === null || v === void 0 ? void 0 : (_v$orderCatalog9 = v.orderCatalog) === null || _v$orderCatalog9 === void 0 ? void 0 : _v$orderCatalog9.DrugCategory,
+                DrugCategory: v === null || v === void 0 ? void 0 : (_v$orderCatalog11 = v.orderCatalog) === null || _v$orderCatalog11 === void 0 ? void 0 : _v$orderCatalog11.DrugCategory,
                 dosageFreqCode: v === null || v === void 0 ? void 0 : v.dosageFreqCode
               });
             });
@@ -45503,15 +46061,15 @@ var tableData = function tableData(patientId, encounterId) {
     db_name: dbName,
     entity: "RCM_PatientChargeTrx",
     filter: "RCM_PatientChargeTrx.patientid=='".concat(patientId, "' && RCM_PatientChargeTrx.encounterid=='").concat(encounterId, "' && RCM_PatientChargeTrx.activestatus==true"),
-    return_fields: "merge(RCM_PatientChargeTrx,{service:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercatalog:false,servicedesc:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).shortdesc:false,orderref:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).prescriptionId:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).order_Id:false,ordcatOrdrugclass:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCategory).shortdesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercategory).ordercategory:false,chargeuom:document(RCM_PatientChargeTrx.chargeuom).UOM},{orderdatetime:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).PrescriptionDate:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).orderDateTime:false})"
+    return_fields: "merge(RCM_PatientChargeTrx,{chargestatus:contains(RCM_PatientChargeTrx.chargestatus,'CodingMaster')?document(RCM_PatientChargeTrx.chargestatus).display:contains(RCM_PatientChargeTrx.chargestatus,'CodeableConceptMaster')?document(document(RCM_PatientChargeTrx.chargestatus).coding)[0].display:''},{service:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercatalog:false,servicedesc:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).shortdesc:false,orderref:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).prescriptionId:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).order_Id:false,ordcatOrdrugclass:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCategory).shortdesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercategory).ordercategory:false,chargeuom:document(RCM_PatientChargeTrx.chargeuom).UOM},{orderdatetime:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).PrescriptionDate:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).orderDateTime:false})"
   };
 };
 var searchCodeDesc = function searchCodeDesc(patientId, encounterId, search) {
   return {
     db_name: "primarycare",
     entity: "RCM_PatientChargeTrx",
-    filter: "RCM_PatientChargeTrx.patientid=='".concat(patientId, "' && RCM_PatientChargeTrx.encounterid=='").concat(encounterId, "' && RCM_PatientChargeTrx.activestatus==true && (like(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc,'%").concat(search, "%',true) || like(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode,'%").concat(search, "%',true))  && (false==true ? RCM_PatientChargeTrx.billstatus == false: RCM_PatientChargeTrx.billstatus == RCM_PatientChargeTrx.billstatus)"),
-    return_fields: "merge(RCM_PatientChargeTrx,{service:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercatalog:false,servicedesc:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).shortdesc:false,orderref:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).prescriptionId:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).order_Id:false,ordcatordrugclass:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCategory).shortdesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercategory).ordercategory:false,chargeuom:document(RCM_PatientChargeTrx.chargeuom).UOM},{orderdatetime:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).PrescriptionDate:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).orderDateTime:false})"
+    filter: "RCM_PatientChargeTrx.patientid=='".concat(patientId, "' && RCM_PatientChargeTrx.encounterid=='").concat(encounterId, "' && RCM_PatientChargeTrx.activestatus==true && (like(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc,'%").concat(search, "%',true) || like(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode,'%").concat(search, "%',true) || like(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercatalog,'%").concat(search, "%',true) ||like(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).shortdesc,'%").concat(search, "%',true)) && (false==true ? RCM_PatientChargeTrx.billstatus == false: RCM_PatientChargeTrx.billstatus == RCM_PatientChargeTrx.billstatus)"),
+    return_fields: "merge(RCM_PatientChargeTrx,{chargestatus:contains(RCM_PatientChargeTrx.chargestatus,'CodingMaster')?document(RCM_PatientChargeTrx.chargestatus).display:contains(RCM_PatientChargeTrx.chargestatus,'CodeableConceptMaster')?document(document(RCM_PatientChargeTrx.chargestatus).coding)[0].display:''},{service:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCode:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercatalog:false,servicedesc:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).drugCode).ShortDesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).shortdesc:false,orderref:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).prescriptionId:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).order_Id:false,ordcatOrdrugclass:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).drugCode).DrugCategory).shortdesc:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(document(document(RCM_PatientChargeTrx.orderrefid).orderCatalog).ordercategory).ordercategory:false,chargeuom:document(RCM_PatientChargeTrx.chargeuom).UOM},{orderdatetime:contains(RCM_PatientChargeTrx.orderrefid,'PH_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).PrescriptionDate:contains(RCM_PatientChargeTrx.orderrefid,'CA_OrderLine')?document(RCM_PatientChargeTrx.orderrefid).orderDateTime:false})"
   };
 };
 var dropDown = {
@@ -45596,9 +46154,10 @@ var saveBill = {
         totgrossamt: billHeaderSave.totgrossamt,
         totdiscamt: billHeaderSave.totdiscamt,
         totnetamt: billHeaderSave.totnetamt,
-        totpatientshare: billHeaderSave.totpatientshare,
+        totpatientshare: Number(billHeaderSave.totpatientshare),
         totpayershare: billHeaderSave.totpayershare,
-        billhstatus: billHeaderSave.billhstatus
+        billhstatus: billHeaderSave.billhstatus,
+        payerid: billHeaderSave === null || billHeaderSave === void 0 ? void 0 : billHeaderSave.payerid
       }
     }];
   },
@@ -45626,25 +46185,132 @@ var saveBill = {
         billhdrid: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.billhdrid,
         receiptno: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.receiptno,
         receiptdate: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.receiptdate,
-        billamt: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.billamt,
-        paidamt: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.paidamt,
+        billamt: Number(paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.billamt),
+        paidamt: Number(paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.paidamt),
         balamt: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.balamt,
         paymentdtls: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.paymentdtls,
-        settlenow: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.settlenow
+        settlenow: paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.settlenow,
+        roundoffamt: Number(paymentPayload === null || paymentPayload === void 0 ? void 0 : paymentPayload.roundoffamt)
       }
     }];
   },
   billStatusSave: function billStatusSave(billIds) {
     return {
-      db_name: "primarycare",
+      db_name: dbName,
       queryid: "b9d07f67-4f09-4c31-b9fd-981bc1decf0c",
       filter: {
         RCM_PatientChargeTrx_id: billIds
       }
     };
+  },
+  billRecieptRead: function billRecieptRead(billHeaderId) {
+    return {
+      db_name: dbName,
+      filter: {
+        biihdr_id: "".concat(billHeaderId)
+      },
+      queryid: "ea55c1ff-ef78-43a8-aecf-4aa0784514eb"
+    };
+  }
+};
+var billRounding = function billRounding(orgId) {
+  return {
+    db_name: "primarycare",
+    entity: "EntityParametersSetup",
+    filter: "EntityParametersSetup.entityid=='".concat(orgId, "' && document(EntityParametersSetup.parameterid).code=='BILLROUNDDECVAL' && EntityParametersSetup.activestatus==true"),
+    return_fields: "unset(EntityParametersSetup,'createdby','createddate','updatedby','updatedate')"
+  };
+};
+
+var makeName = function makeName() {
+  var _prefix$, _prefix$$coding, _prefix$$coding$, _prefix$coding, _prefix$coding$, _prefix$2, _suffix$, _suffix$$coding, _suffix$$coding$, _suffix$coding, _suffix$coding$, _suffix$2;
+
+  var nameObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _nameObj$prefix = nameObj.prefix,
+      prefix = _nameObj$prefix === void 0 ? "" : _nameObj$prefix,
+      _nameObj$given = nameObj.given,
+      given = _nameObj$given === void 0 ? "" : _nameObj$given,
+      _nameObj$text = nameObj.text,
+      text = _nameObj$text === void 0 ? "" : _nameObj$text,
+      _nameObj$suffix = nameObj.suffix,
+      suffix = _nameObj$suffix === void 0 ? "" : _nameObj$suffix,
+      _nameObj$family = nameObj.family,
+      family = _nameObj$family === void 0 ? "" : _nameObj$family;
+  var prefixVal = (prefix === null || prefix === void 0 ? void 0 : (_prefix$ = prefix[0]) === null || _prefix$ === void 0 ? void 0 : (_prefix$$coding = _prefix$.coding) === null || _prefix$$coding === void 0 ? void 0 : (_prefix$$coding$ = _prefix$$coding[0]) === null || _prefix$$coding$ === void 0 ? void 0 : _prefix$$coding$.display) || (prefix === null || prefix === void 0 ? void 0 : (_prefix$coding = prefix.coding) === null || _prefix$coding === void 0 ? void 0 : (_prefix$coding$ = _prefix$coding[0]) === null || _prefix$coding$ === void 0 ? void 0 : _prefix$coding$.display) || (prefix === null || prefix === void 0 ? void 0 : (_prefix$2 = prefix[0]) === null || _prefix$2 === void 0 ? void 0 : _prefix$2.display) || (prefix === null || prefix === void 0 ? void 0 : prefix.display) || "";
+  var suffixVal = (suffix === null || suffix === void 0 ? void 0 : (_suffix$ = suffix[0]) === null || _suffix$ === void 0 ? void 0 : (_suffix$$coding = _suffix$.coding) === null || _suffix$$coding === void 0 ? void 0 : (_suffix$$coding$ = _suffix$$coding[0]) === null || _suffix$$coding$ === void 0 ? void 0 : _suffix$$coding$.display) || (suffix === null || suffix === void 0 ? void 0 : (_suffix$coding = suffix.coding) === null || _suffix$coding === void 0 ? void 0 : (_suffix$coding$ = _suffix$coding[0]) === null || _suffix$coding$ === void 0 ? void 0 : _suffix$coding$.display) || (suffix === null || suffix === void 0 ? void 0 : (_suffix$2 = suffix[0]) === null || _suffix$2 === void 0 ? void 0 : _suffix$2.display) || (suffix === null || suffix === void 0 ? void 0 : suffix.display) || "";
+  return "".concat(prefixVal && prefixVal + ".").concat(text && text + " ").concat(given && given + " ").concat(family && family + " ").concat(suffixVal && suffixVal);
+};
+
+var createDate = function createDate(date, format) {
+  if (format) {
+    return moment$1.unix(date).format("".concat(format));
+  } else {
+    return moment$1.unix(date).format("DD/MM/YYYY HH:mm");
   }
 };
 
+var constructReciept = function constructReciept(data) {
+  var _data$encounterid, _data$encounterid$Org, _data$encounterid2, _data$encounterid2$Or, _data$encounterid3, _data$encounterid3$Or, _data$encounterid4, _data$encounterid4$Or, _data$encounterid4$Or2, _data$encounterid4$Or3, _data$encounterid5, _data$encounterid5$Or, _data$encounterid5$Or2, _data$encounterid5$Or3, _data$patientid, _data$patientid2, _data$patientid3, _data$patientid3$gend, _data$patientid4, _data$encounterid6, _data$encounterid7, _data$encounterid8, _data$encounterid8$pr, _data$encounterid8$pr2, _data$encounterid8$pr3, _data$encounterid9, _data$encounterid9$pr, _data$encounterid9$pr2, _data$encounterid10, _data$encounterid10$p, _data$encounterid10$p2, _data$payerid, _data$paymentdtls, _data$paymentdtls$, _data$paymentdtls2, _data$paymentdtls2$, _data$paymentdtls3, _data$paymentdtls3$, _data$totgrossamt, _data$totdiscamt, _data$totnetamt, _data$totpatientshare, _data$totpayershare, _data$paymentdtls4, _data$paymentdtls4$, _data$paymentdtls4$$b, _data$paymentdtls5, _data$paymentdtls5$, _data$paymentdtls5$$b, _data$paymentdtls6, _data$paymentdtls6$, _data$paymentdtls6$$p, _data$glNo, _data$glDate, _data$guarantor, _data$plan, _data$sponsor;
+
+  debugger;
+  var pinCode = data === null || data === void 0 ? void 0 : (_data$encounterid = data.encounterid) === null || _data$encounterid === void 0 ? void 0 : (_data$encounterid$Org = _data$encounterid.Organization_id) === null || _data$encounterid$Org === void 0 ? void 0 : _data$encounterid$Org.address;
+  return {
+    address: {
+      name: data === null || data === void 0 ? void 0 : (_data$encounterid2 = data.encounterid) === null || _data$encounterid2 === void 0 ? void 0 : (_data$encounterid2$Or = _data$encounterid2.Organization_id) === null || _data$encounterid2$Or === void 0 ? void 0 : _data$encounterid2$Or.name,
+      addressName: pinCode === null || pinCode === void 0 ? void 0 : pinCode.substring(0, pinCode.length - 8),
+      postBox: pinCode === null || pinCode === void 0 ? void 0 : pinCode.slice(-6),
+      logo: data === null || data === void 0 ? void 0 : (_data$encounterid3 = data.encounterid) === null || _data$encounterid3 === void 0 ? void 0 : (_data$encounterid3$Or = _data$encounterid3.Organization_id) === null || _data$encounterid3$Or === void 0 ? void 0 : _data$encounterid3$Or.logo,
+      telecom: (data === null || data === void 0 ? void 0 : (_data$encounterid4 = data.encounterid) === null || _data$encounterid4 === void 0 ? void 0 : (_data$encounterid4$Or = _data$encounterid4.Organization_id) === null || _data$encounterid4$Or === void 0 ? void 0 : (_data$encounterid4$Or2 = _data$encounterid4$Or.telecom) === null || _data$encounterid4$Or2 === void 0 ? void 0 : (_data$encounterid4$Or3 = _data$encounterid4$Or2[0]) === null || _data$encounterid4$Or3 === void 0 ? void 0 : _data$encounterid4$Or3.valueprefix) + " " + (data === null || data === void 0 ? void 0 : (_data$encounterid5 = data.encounterid) === null || _data$encounterid5 === void 0 ? void 0 : (_data$encounterid5$Or = _data$encounterid5.Organization_id) === null || _data$encounterid5$Or === void 0 ? void 0 : (_data$encounterid5$Or2 = _data$encounterid5$Or.telecom) === null || _data$encounterid5$Or2 === void 0 ? void 0 : (_data$encounterid5$Or3 = _data$encounterid5$Or2[0]) === null || _data$encounterid5$Or3 === void 0 ? void 0 : _data$encounterid5$Or3.value)
+    },
+    patient: {
+      name: makeName(data === null || data === void 0 ? void 0 : (_data$patientid = data.patientid) === null || _data$patientid === void 0 ? void 0 : _data$patientid.name[0]),
+      age: data === null || data === void 0 ? void 0 : (_data$patientid2 = data.patientid) === null || _data$patientid2 === void 0 ? void 0 : _data$patientid2.age,
+      gender: data === null || data === void 0 ? void 0 : (_data$patientid3 = data.patientid) === null || _data$patientid3 === void 0 ? void 0 : (_data$patientid3$gend = _data$patientid3.gender) === null || _data$patientid3$gend === void 0 ? void 0 : _data$patientid3$gend.display,
+      mrn: data === null || data === void 0 ? void 0 : (_data$patientid4 = data.patientid) === null || _data$patientid4 === void 0 ? void 0 : _data$patientid4.alias
+    },
+    encounterStartDate: createDate(data === null || data === void 0 ? void 0 : (_data$encounterid6 = data.encounterid) === null || _data$encounterid6 === void 0 ? void 0 : _data$encounterid6.encounterdate),
+    encounterEndDate: createDate(data === null || data === void 0 ? void 0 : (_data$encounterid7 = data.encounterid) === null || _data$encounterid7 === void 0 ? void 0 : _data$encounterid7.encounterenddate),
+    practitioner: {
+      speciality: data === null || data === void 0 ? void 0 : (_data$encounterid8 = data.encounterid) === null || _data$encounterid8 === void 0 ? void 0 : (_data$encounterid8$pr = _data$encounterid8.practitioner_details) === null || _data$encounterid8$pr === void 0 ? void 0 : (_data$encounterid8$pr2 = _data$encounterid8$pr[0]) === null || _data$encounterid8$pr2 === void 0 ? void 0 : (_data$encounterid8$pr3 = _data$encounterid8$pr2.speciality) === null || _data$encounterid8$pr3 === void 0 ? void 0 : _data$encounterid8$pr3.display,
+      name: data === null || data === void 0 ? void 0 : (_data$encounterid9 = data.encounterid) === null || _data$encounterid9 === void 0 ? void 0 : (_data$encounterid9$pr = _data$encounterid9.practitioner_details) === null || _data$encounterid9$pr === void 0 ? void 0 : (_data$encounterid9$pr2 = _data$encounterid9$pr[0]) === null || _data$encounterid9$pr2 === void 0 ? void 0 : _data$encounterid9$pr2.id_name,
+      location: data === null || data === void 0 ? void 0 : (_data$encounterid10 = data.encounterid) === null || _data$encounterid10 === void 0 ? void 0 : (_data$encounterid10$p = _data$encounterid10.practitioner_details) === null || _data$encounterid10$p === void 0 ? void 0 : (_data$encounterid10$p2 = _data$encounterid10$p[0]) === null || _data$encounterid10$p2 === void 0 ? void 0 : _data$encounterid10$p2.clinic
+    },
+    billNo: data === null || data === void 0 ? void 0 : data.billno,
+    billdate: createDate(data === null || data === void 0 ? void 0 : data.billdate),
+    payerid: (_data$payerid = data === null || data === void 0 ? void 0 : data.payerid) !== null && _data$payerid !== void 0 ? _data$payerid : "-",
+    recieptNo: data === null || data === void 0 ? void 0 : (_data$paymentdtls = data.paymentdtls) === null || _data$paymentdtls === void 0 ? void 0 : (_data$paymentdtls$ = _data$paymentdtls[0]) === null || _data$paymentdtls$ === void 0 ? void 0 : _data$paymentdtls$.receiptno,
+    recieptDate: createDate(data === null || data === void 0 ? void 0 : (_data$paymentdtls2 = data.paymentdtls) === null || _data$paymentdtls2 === void 0 ? void 0 : (_data$paymentdtls2$ = _data$paymentdtls2[0]) === null || _data$paymentdtls2$ === void 0 ? void 0 : _data$paymentdtls2$.receiptdate, "DD-MMM-YY"),
+    billDetails: data === null || data === void 0 ? void 0 : data.billdetails.map(function (val) {
+      var _val$patchargetrxid, _val$patchargetrxid2, _val$patchargetrxid2$, _val$patchargetrxid3, _val$grossamt, _val$discamt, _val$netamt, _val$patientshare, _val$payershare;
+
+      return {
+        itemCode: val === null || val === void 0 ? void 0 : (_val$patchargetrxid = val.patchargetrxid) === null || _val$patchargetrxid === void 0 ? void 0 : _val$patchargetrxid.orderrefid,
+        rate: val === null || val === void 0 ? void 0 : (_val$patchargetrxid2 = val.patchargetrxid) === null || _val$patchargetrxid2 === void 0 ? void 0 : (_val$patchargetrxid2$ = _val$patchargetrxid2.rate) === null || _val$patchargetrxid2$ === void 0 ? void 0 : _val$patchargetrxid2$.toFixed(2),
+        qty: val === null || val === void 0 ? void 0 : (_val$patchargetrxid3 = val.patchargetrxid) === null || _val$patchargetrxid3 === void 0 ? void 0 : _val$patchargetrxid3.qty,
+        grossAmt: val === null || val === void 0 ? void 0 : (_val$grossamt = val.grossamt) === null || _val$grossamt === void 0 ? void 0 : _val$grossamt.toFixed(2),
+        discount: val === null || val === void 0 ? void 0 : (_val$discamt = val.discamt) === null || _val$discamt === void 0 ? void 0 : _val$discamt.toFixed(2),
+        netAmt: val === null || val === void 0 ? void 0 : (_val$netamt = val.netamt) === null || _val$netamt === void 0 ? void 0 : _val$netamt.toFixed(2),
+        patientShare: val === null || val === void 0 ? void 0 : (_val$patientshare = val.patientshare) === null || _val$patientshare === void 0 ? void 0 : _val$patientshare.toFixed(2),
+        creditShare: val === null || val === void 0 ? void 0 : (_val$payershare = val.payershare) === null || _val$payershare === void 0 ? void 0 : _val$payershare.toFixed(2)
+      };
+    }),
+    roundoffamt: data === null || data === void 0 ? void 0 : (_data$paymentdtls3 = data.paymentdtls) === null || _data$paymentdtls3 === void 0 ? void 0 : (_data$paymentdtls3$ = _data$paymentdtls3[0]) === null || _data$paymentdtls3$ === void 0 ? void 0 : _data$paymentdtls3$.roundoffamt,
+    totgrossamt: data === null || data === void 0 ? void 0 : (_data$totgrossamt = data.totgrossamt) === null || _data$totgrossamt === void 0 ? void 0 : _data$totgrossamt.toFixed(2),
+    totdiscamt: data === null || data === void 0 ? void 0 : (_data$totdiscamt = data.totdiscamt) === null || _data$totdiscamt === void 0 ? void 0 : _data$totdiscamt.toFixed(2),
+    totnetamt: data === null || data === void 0 ? void 0 : (_data$totnetamt = data.totnetamt) === null || _data$totnetamt === void 0 ? void 0 : _data$totnetamt.toFixed(2),
+    totpatientshare: data === null || data === void 0 ? void 0 : (_data$totpatientshare = data.totpatientshare) === null || _data$totpatientshare === void 0 ? void 0 : _data$totpatientshare.toFixed(2),
+    totpayershare: data === null || data === void 0 ? void 0 : (_data$totpayershare = data.totpayershare) === null || _data$totpayershare === void 0 ? void 0 : _data$totpayershare.toFixed(2),
+    billamt: data === null || data === void 0 ? void 0 : (_data$paymentdtls4 = data.paymentdtls) === null || _data$paymentdtls4 === void 0 ? void 0 : (_data$paymentdtls4$ = _data$paymentdtls4[0]) === null || _data$paymentdtls4$ === void 0 ? void 0 : (_data$paymentdtls4$$b = _data$paymentdtls4$.billamt) === null || _data$paymentdtls4$$b === void 0 ? void 0 : _data$paymentdtls4$$b.toFixed(2),
+    balamt: data === null || data === void 0 ? void 0 : (_data$paymentdtls5 = data.paymentdtls) === null || _data$paymentdtls5 === void 0 ? void 0 : (_data$paymentdtls5$ = _data$paymentdtls5[0]) === null || _data$paymentdtls5$ === void 0 ? void 0 : (_data$paymentdtls5$$b = _data$paymentdtls5$.balamt) === null || _data$paymentdtls5$$b === void 0 ? void 0 : _data$paymentdtls5$$b.toFixed(2),
+    paidamt: data === null || data === void 0 ? void 0 : (_data$paymentdtls6 = data.paymentdtls) === null || _data$paymentdtls6 === void 0 ? void 0 : (_data$paymentdtls6$ = _data$paymentdtls6[0]) === null || _data$paymentdtls6$ === void 0 ? void 0 : (_data$paymentdtls6$$p = _data$paymentdtls6$.paidamt) === null || _data$paymentdtls6$$p === void 0 ? void 0 : _data$paymentdtls6$$p.toFixed(2),
+    glNo: (_data$glNo = data === null || data === void 0 ? void 0 : data.glNo) !== null && _data$glNo !== void 0 ? _data$glNo : "-",
+    glDate: (_data$glDate = data === null || data === void 0 ? void 0 : data.glDate) !== null && _data$glDate !== void 0 ? _data$glDate : "-",
+    guarantor: (_data$guarantor = data === null || data === void 0 ? void 0 : data.guarantor) !== null && _data$guarantor !== void 0 ? _data$guarantor : "-",
+    plan: (_data$plan = data === null || data === void 0 ? void 0 : data.plan) !== null && _data$plan !== void 0 ? _data$plan : "-",
+    sponsor: (_data$sponsor = data === null || data === void 0 ? void 0 : data.sponsor) !== null && _data$sponsor !== void 0 ? _data$sponsor : "-"
+  };
+};
+
 var _extraReducers$3;
 var SEARCH_VIA_NAME = createAsyncThunk("billSettlementSlice/searchViaName", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
@@ -46412,6 +47078,93 @@ var BILL_STATUS_SAVE = createAsyncThunk("billSettlementSlice/paymentSave", /*#__
     }
   }, _callee17, null, [[2, 10]]);
 })));
+var BILL_RECEIPT_READ = createAsyncThunk("billSettlementSlice/billReceiptRead", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
+  var payload,
+      _ref37,
+      rejectWithValue,
+      billHeaderId,
+      data,
+      resultData,
+      _args18 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee18$(_context18) {
+    while (1) {
+      switch (_context18.prev = _context18.next) {
+        case 0:
+          payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
+          _ref37 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref37.rejectWithValue;
+          debugger;
+          _context18.prev = 3;
+          billHeaderId = payload.billHeaderId;
+          _context18.next = 7;
+          return fetchData$3({
+            body: JSON.stringify(saveBill.billRecieptRead(billHeaderId))
+          }, __baseUrl__);
+
+        case 7:
+          data = _context18.sent;
+          resultData = constructReciept(data[0]);
+          debugger;
+          console.log("resultData", resultData);
+          return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: resultData
+          }));
+
+        case 14:
+          _context18.prev = 14;
+          _context18.t0 = _context18["catch"](3);
+          return _context18.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context18.t0.message
+          })));
+
+        case 17:
+        case "end":
+          return _context18.stop();
+      }
+    }
+  }, _callee18, null, [[3, 14]]);
+})));
+var BILL_ROUND_OFF = createAsyncThunk("billSettlementSlice/billRoundOff", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
+  var payload,
+      _ref39,
+      rejectWithValue,
+      orgId,
+      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] : {};
+          _ref39 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref39.rejectWithValue;
+          _context19.prev = 2;
+          orgId = payload.orgId;
+          _context19.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(billRounding(orgId))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context19.sent;
+          return _context19.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            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 billSettlementSlice = createSlice({
   name: "billSettlementSlice",
   initialState: {
@@ -46431,7 +47184,9 @@ var billSettlementSlice = createSlice({
     bill_details_save: _objectSpread2({}, defaultState.Info),
     payment_save: _objectSpread2({}, defaultState.Info),
     payment_dropDown: _objectSpread2({}, defaultState.Info),
-    billing_status_save: _objectSpread2({}, defaultState.Info)
+    billing_status_save: _objectSpread2({}, defaultState.Info),
+    bill_reciept_read: _objectSpread2({}, defaultState.Info),
+    bill_roundoff: _objectSpread2({}, defaultState.Info)
   },
   extraReducers: (_extraReducers$3 = {}, _defineProperty(_extraReducers$3, SEARCH_VIA_NAME.fulfilled, function (state, action) {
     var _action$payload;
@@ -46603,6 +47358,26 @@ var billSettlementSlice = createSlice({
     var _action$payload34;
 
     state.billing_status_save = (_action$payload34 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload34 !== void 0 ? _action$payload34 : {};
+  }), _defineProperty(_extraReducers$3, BILL_RECEIPT_READ.fulfilled, function (state, action) {
+    var _action$payload35;
+
+    state.bill_reciept_read = (_action$payload35 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload35 !== void 0 ? _action$payload35 : {};
+  }), _defineProperty(_extraReducers$3, BILL_RECEIPT_READ.pending, function (state, action) {
+    state.bill_reciept_read.loading = true;
+  }), _defineProperty(_extraReducers$3, BILL_RECEIPT_READ.rejected, function (state, action) {
+    var _action$payload36;
+
+    state.bill_reciept_read = (_action$payload36 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload36 !== void 0 ? _action$payload36 : {};
+  }), _defineProperty(_extraReducers$3, BILL_ROUND_OFF.fulfilled, function (state, action) {
+    var _action$payload37;
+
+    state.bill_roundoff = (_action$payload37 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload37 !== void 0 ? _action$payload37 : {};
+  }), _defineProperty(_extraReducers$3, BILL_ROUND_OFF.pending, function (state, action) {
+    state.bill_roundoff.loading = true;
+  }), _defineProperty(_extraReducers$3, BILL_ROUND_OFF.rejected, function (state, action) {
+    var _action$payload38;
+
+    state.bill_roundoff = (_action$payload38 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload38 !== void 0 ? _action$payload38 : {};
   }), _extraReducers$3)
 });
 var billSettlementActions = {
@@ -46622,7 +47397,9 @@ var billSettlementActions = {
   BILL_DETAILS_SAVE: BILL_DETAILS_SAVE,
   PAYMENT_SAVE: PAYMENT_SAVE,
   PAYMENT_DROPDOWN: PAYMENT_DROPDOWN,
-  BILL_STATUS_SAVE: BILL_STATUS_SAVE
+  BILL_STATUS_SAVE: BILL_STATUS_SAVE,
+  BILL_RECEIPT_READ: BILL_RECEIPT_READ,
+  BILL_ROUND_OFF: BILL_ROUND_OFF
 };
 var billSettlementSlice$1 = billSettlementSlice.reducer;
 
@@ -46820,7 +47597,7 @@ var GET_PATIENTS_CHECKED_IN = createAsyncThunk("currentVisitStatsApiSlice/getPat
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.MRN,
               orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$ = _$appointmentId[0]) === null || _$appointmentId$ === void 0 ? void 0 : _$appointmentId$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : _$appointmentId2$.start, "DD MMM,YYYY") : "",
               orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start, "hh:mm A") : "",
@@ -46891,7 +47668,7 @@ var GET_TRAIGE_DONE = createAsyncThunk("currentVisitStatsApiSlice/getTriageDone"
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id8 = _.patient_id) === null || _$patient_id8 === void 0 ? void 0 : (_$patient_id8$ = _$patient_id8[0]) === null || _$patient_id8$ === void 0 ? void 0 : _$patient_id8$.MRN,
               orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : _$appointmentId8$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.start, "DD MMM,YYYY") : "",
               orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : _$appointmentId10$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.start, "hh:mm A") : "",
@@ -46962,7 +47739,7 @@ var GET_VISIT_COMPLETED = createAsyncThunk("currentVisitStatsApiSlice/getVisitCo
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : _$patient_id14$.MRN,
               orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start, "DD MMM,YYYY") : "",
               orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start, "hh:mm A") : "",
@@ -47099,7 +47876,7 @@ var GET_PATIENTS_CHECKED_IN_NURSE = createAsyncThunk("currentVisitStatsApiSlice/
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : (_$patient_id23$$name = _$patient_id23$.name) === null || _$patient_id23$$name === void 0 ? void 0 : _$patient_id23$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : (_$patient_id23$$name = _$patient_id23$.name) === null || _$patient_id23$$name === void 0 ? void 0 : _$patient_id23$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id24 = _.patient_id) === null || _$patient_id24 === void 0 ? void 0 : (_$patient_id24$ = _$patient_id24[0]) === null || _$patient_id24$ === void 0 ? void 0 : _$patient_id24$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : _$patient_id25$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : (_$patient_id26$$gende = _$patient_id26$.gender) === null || _$patient_id26$$gende === void 0 ? void 0 : _$patient_id26$$gende.display,
@@ -47167,7 +47944,7 @@ var GET_VISIT_COMPLETED_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getV
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : (_$patient_id28$$name = _$patient_id28$.name) === null || _$patient_id28$$name === void 0 ? void 0 : _$patient_id28$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : (_$patient_id28$$name = _$patient_id28$.name) === null || _$patient_id28$$name === void 0 ? void 0 : _$patient_id28$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id29 = _.patient_id) === null || _$patient_id29 === void 0 ? void 0 : (_$patient_id29$ = _$patient_id29[0]) === null || _$patient_id29$ === void 0 ? void 0 : _$patient_id29$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id30 = _.patient_id) === null || _$patient_id30 === void 0 ? void 0 : (_$patient_id30$ = _$patient_id30[0]) === null || _$patient_id30$ === void 0 ? void 0 : _$patient_id30$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : (_$patient_id31$$gende = _$patient_id31$.gender) === null || _$patient_id31$$gende === void 0 ? void 0 : _$patient_id31$$gende.display,
@@ -47299,7 +48076,7 @@ var GET_TRAIGE_DONE_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getTriag
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id33 = _.patient_id) === null || _$patient_id33 === void 0 ? void 0 : (_$patient_id33$ = _$patient_id33[0]) === null || _$patient_id33$ === void 0 ? void 0 : (_$patient_id33$$name = _$patient_id33$.name) === null || _$patient_id33$$name === void 0 ? void 0 : _$patient_id33$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id33 = _.patient_id) === null || _$patient_id33 === void 0 ? void 0 : (_$patient_id33$ = _$patient_id33[0]) === null || _$patient_id33$ === void 0 ? void 0 : (_$patient_id33$$name = _$patient_id33$.name) === null || _$patient_id33$$name === void 0 ? void 0 : _$patient_id33$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id34 = _.patient_id) === null || _$patient_id34 === void 0 ? void 0 : (_$patient_id34$ = _$patient_id34[0]) === null || _$patient_id34$ === void 0 ? void 0 : _$patient_id34$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : (_$patient_id35$ = _$patient_id35[0]) === null || _$patient_id35$ === void 0 ? void 0 : _$patient_id35$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id36 = _.patient_id) === null || _$patient_id36 === void 0 ? void 0 : (_$patient_id36$ = _$patient_id36[0]) === null || _$patient_id36$ === void 0 ? void 0 : (_$patient_id36$$gende = _$patient_id36$.gender) === null || _$patient_id36$$gende === void 0 ? void 0 : _$patient_id36$$gende.display,
@@ -47432,7 +48209,7 @@ var GET_PATIENTS_CHECKED_IN_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id38 = _.patient_id) === null || _$patient_id38 === void 0 ? void 0 : (_$patient_id38$ = _$patient_id38[0]) === null || _$patient_id38$ === void 0 ? void 0 : (_$patient_id38$$name = _$patient_id38$.name) === null || _$patient_id38$$name === void 0 ? void 0 : _$patient_id38$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id38 = _.patient_id) === null || _$patient_id38 === void 0 ? void 0 : (_$patient_id38$ = _$patient_id38[0]) === null || _$patient_id38$ === void 0 ? void 0 : (_$patient_id38$$name = _$patient_id38$.name) === null || _$patient_id38$$name === void 0 ? void 0 : _$patient_id38$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id39 = _.patient_id) === null || _$patient_id39 === void 0 ? void 0 : (_$patient_id39$ = _$patient_id39[0]) === null || _$patient_id39$ === void 0 ? void 0 : _$patient_id39$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id40 = _.patient_id) === null || _$patient_id40 === void 0 ? void 0 : (_$patient_id40$ = _$patient_id40[0]) === null || _$patient_id40$ === void 0 ? void 0 : _$patient_id40$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id41 = _.patient_id) === null || _$patient_id41 === void 0 ? void 0 : (_$patient_id41$ = _$patient_id41[0]) === null || _$patient_id41$ === void 0 ? void 0 : (_$patient_id41$$gende = _$patient_id41$.gender) === null || _$patient_id41$$gende === void 0 ? void 0 : _$patient_id41$$gende.display,
@@ -47501,7 +48278,7 @@ var GET_VISIT_COMPLETED_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/get
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id43 = _.patient_id) === null || _$patient_id43 === void 0 ? void 0 : (_$patient_id43$ = _$patient_id43[0]) === null || _$patient_id43$ === void 0 ? void 0 : (_$patient_id43$$name = _$patient_id43$.name) === null || _$patient_id43$$name === void 0 ? void 0 : _$patient_id43$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id43 = _.patient_id) === null || _$patient_id43 === void 0 ? void 0 : (_$patient_id43$ = _$patient_id43[0]) === null || _$patient_id43$ === void 0 ? void 0 : (_$patient_id43$$name = _$patient_id43$.name) === null || _$patient_id43$$name === void 0 ? void 0 : _$patient_id43$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id44 = _.patient_id) === null || _$patient_id44 === void 0 ? void 0 : (_$patient_id44$ = _$patient_id44[0]) === null || _$patient_id44$ === void 0 ? void 0 : _$patient_id44$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id45 = _.patient_id) === null || _$patient_id45 === void 0 ? void 0 : (_$patient_id45$ = _$patient_id45[0]) === null || _$patient_id45$ === void 0 ? void 0 : _$patient_id45$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id46 = _.patient_id) === null || _$patient_id46 === void 0 ? void 0 : (_$patient_id46$ = _$patient_id46[0]) === null || _$patient_id46$ === void 0 ? void 0 : (_$patient_id46$$gende = _$patient_id46$.gender) === null || _$patient_id46$$gende === void 0 ? void 0 : _$patient_id46$$gende.display,
@@ -47570,7 +48347,7 @@ var GET_TRAIGE_DONE_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/getTria
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
               //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
               //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id48 = _.patient_id) === null || _$patient_id48 === void 0 ? void 0 : (_$patient_id48$ = _$patient_id48[0]) === null || _$patient_id48$ === void 0 ? void 0 : (_$patient_id48$$name = _$patient_id48$.name) === null || _$patient_id48$$name === void 0 ? void 0 : _$patient_id48$$name[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$patient_id48 = _.patient_id) === null || _$patient_id48 === void 0 ? void 0 : (_$patient_id48$ = _$patient_id48[0]) === null || _$patient_id48$ === void 0 ? void 0 : (_$patient_id48$$name = _$patient_id48$.name) === null || _$patient_id48$$name === void 0 ? void 0 : _$patient_id48$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id49 = _.patient_id) === null || _$patient_id49 === void 0 ? void 0 : (_$patient_id49$ = _$patient_id49[0]) === null || _$patient_id49$ === void 0 ? void 0 : _$patient_id49$.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$patient_id50 = _.patient_id) === null || _$patient_id50 === void 0 ? void 0 : (_$patient_id50$ = _$patient_id50[0]) === null || _$patient_id50$ === void 0 ? void 0 : _$patient_id50$.age,
               gender: _ === null || _ === void 0 ? void 0 : (_$patient_id51 = _.patient_id) === null || _$patient_id51 === void 0 ? void 0 : (_$patient_id51$ = _$patient_id51[0]) === null || _$patient_id51$ === void 0 ? void 0 : (_$patient_id51$$gende = _$patient_id51$.gender) === null || _$patient_id51$$gende === void 0 ? void 0 : _$patient_id51$$gende.display,
@@ -47976,7 +48753,7 @@ var GET_ASSIGN_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getAssignP
             var _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Encounter3, _$Encounter3$patient_, _$Encounter3$patient_2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Appointment, _$Appointment2, _$Appointment3, _$Encounter5, _$Encounter6, _$Encounter7, _$Encounter7$status;
 
             return {
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$Encounter3 = _.Encounter) === null || _$Encounter3 === void 0 ? void 0 : (_$Encounter3$patient_ = _$Encounter3.patient_id) === null || _$Encounter3$patient_ === void 0 ? void 0 : (_$Encounter3$patient_2 = _$Encounter3$patient_[0]) === null || _$Encounter3$patient_2 === void 0 ? void 0 : _$Encounter3$patient_2.age,
               mobileNo: _ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$patient_ = _$Encounter4.patient_id) === null || _$Encounter4$patient_ === void 0 ? void 0 : (_$Encounter4$patient_2 = _$Encounter4$patient_[0]) === null || _$Encounter4$patient_2 === void 0 ? void 0 : (_$Encounter4$patient_3 = _$Encounter4$patient_2.telecom) === null || _$Encounter4$patient_3 === void 0 ? void 0 : (_$Encounter4$patient_4 = _$Encounter4$patient_3[0]) === null || _$Encounter4$patient_4 === void 0 ? void 0 : _$Encounter4$patient_4.value,
@@ -48036,8 +48813,8 @@ var GET_REASSIGN_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getReAss
             var _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Encounter8$patient_3, _$Encounter9, _$Encounter9$particip, _$Encounter9$particip2, _$Encounter9$particip3, _$Encounter9$particip4, _$Encounter9$particip5, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter11, _$Encounter11$patient, _$Encounter11$patient2, _$Encounter12, _$Encounter12$patient, _$Encounter12$patient2, _$Encounter12$patient3, _$Encounter12$patient4, _$Appointment4, _$Appointment5, _$Appointment6, _$Encounter13, _$Encounter14, _$Encounter15, _$Encounter15$status;
 
             return {
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
-              assignedPractitioner: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$particip = _$Encounter9.participant) === null || _$Encounter9$particip === void 0 ? void 0 : (_$Encounter9$particip2 = _$Encounter9$particip[0]) === null || _$Encounter9$particip2 === void 0 ? void 0 : (_$Encounter9$particip3 = _$Encounter9$particip2.Practitioner_id) === null || _$Encounter9$particip3 === void 0 ? void 0 : (_$Encounter9$particip4 = _$Encounter9$particip3[0]) === null || _$Encounter9$particip4 === void 0 ? void 0 : (_$Encounter9$particip5 = _$Encounter9$particip4.name) === null || _$Encounter9$particip5 === void 0 ? void 0 : _$Encounter9$particip5[0]) || {}),
+              name: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
+              assignedPractitioner: makeName$1((_ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$particip = _$Encounter9.participant) === null || _$Encounter9$particip === void 0 ? void 0 : (_$Encounter9$particip2 = _$Encounter9$particip[0]) === null || _$Encounter9$particip2 === void 0 ? void 0 : (_$Encounter9$particip3 = _$Encounter9$particip2.Practitioner_id) === null || _$Encounter9$particip3 === void 0 ? void 0 : (_$Encounter9$particip4 = _$Encounter9$particip3[0]) === null || _$Encounter9$particip4 === void 0 ? void 0 : (_$Encounter9$particip5 = _$Encounter9$particip4.name) === null || _$Encounter9$particip5 === void 0 ? void 0 : _$Encounter9$particip5[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter10 = _.Encounter) === null || _$Encounter10 === void 0 ? void 0 : (_$Encounter10$patient = _$Encounter10.patient_id) === null || _$Encounter10$patient === void 0 ? void 0 : (_$Encounter10$patient2 = _$Encounter10$patient[0]) === null || _$Encounter10$patient2 === void 0 ? void 0 : _$Encounter10$patient2.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : (_$Encounter11$patient = _$Encounter11.patient_id) === null || _$Encounter11$patient === void 0 ? void 0 : (_$Encounter11$patient2 = _$Encounter11$patient[0]) === null || _$Encounter11$patient2 === void 0 ? void 0 : _$Encounter11$patient2.age,
               mobileNo: _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$patient = _$Encounter12.patient_id) === null || _$Encounter12$patient === void 0 ? void 0 : (_$Encounter12$patient2 = _$Encounter12$patient[0]) === null || _$Encounter12$patient2 === void 0 ? void 0 : (_$Encounter12$patient3 = _$Encounter12$patient2.telecom) === null || _$Encounter12$patient3 === void 0 ? void 0 : (_$Encounter12$patient4 = _$Encounter12$patient3[0]) === null || _$Encounter12$patient4 === void 0 ? void 0 : _$Encounter12$patient4.value,
@@ -48096,7 +48873,7 @@ var GET_CLOSE_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getClosePra
             var _makeName, _$patient_id, _$patient_id$, _$patient_id$$name, _$practitioner_detail, _$practitioner_detail2, _$practitioner_detail3, _$patient_id$0$alias, _$patient_id2, _$patient_id2$, _$patient_id$0$age, _$patient_id3, _$patient_id3$, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$patient_id5, _$patient_id5$, _$patient_id5$$teleco, _$patient_id5$$teleco2, _$appointmentId$appno, _$appointmentId, _$appointmentId2, _$appointmentId3, _ref7, _$visit_type, _$status$display, _$status;
 
             return {
-              name: (_makeName = makeName(_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0])) !== null && _makeName !== void 0 ? _makeName : "",
+              name: (_makeName = makeName$1(_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0])) !== null && _makeName !== void 0 ? _makeName : "",
               assignedPractitioner: (_$practitioner_detail = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail2 = _.practitioner_details) === null || _$practitioner_detail2 === void 0 ? void 0 : (_$practitioner_detail3 = _$practitioner_detail2[0]) === null || _$practitioner_detail3 === void 0 ? void 0 : _$practitioner_detail3.id_name) !== null && _$practitioner_detail !== void 0 ? _$practitioner_detail : "",
               mrn: (_$patient_id$0$alias = _ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.alias) !== null && _$patient_id$0$alias !== void 0 ? _$patient_id$0$alias : "",
               age: (_$patient_id$0$age = _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : _$patient_id3$.age) !== null && _$patient_id$0$age !== void 0 ? _$patient_id$0$age : "",