primarycare-binder 1.1.66 → 1.1.69

package/dist/index.cjs.js

@@ -10399,7 +10399,7 @@ var PATIENT_SDI_READ = createAsyncThunk("patientReducer/readPatientSbi", /*#__PU
           data = {
             db_name: dbName,
             entity: "SMGeographicMaster",
-            filter: "lower(document(SMGeographicMaster.geogLevelType).display)=='country' && SMGeographicMaster.activestatus == true",
+            filter: "lower(document(SMGeographicMaster.geogLevelType).display)=='country' && SMGeographicMaster.activestatus == true && SMGeographicMaster.active == true",
             return_fields: "{_id:SMGeographicMaster._id,id:SMGeographicMaster.id,geogLevelName:SMGeographicMaster.geogLevelName,parentGeogLevelType:SMGeographicMaster.parentGeogLevelType,parentGeogLevelCode:SMGeographicMaster.parentGeogLevelCode,GeoLocationISDCode:SMGeographicMaster.GeoLocationISDCode}"
           };
           _context7.next = 6;
@@ -12411,6 +12411,7 @@ var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonF
             db_name: dbName,
             entity: "CodingMaster",
             filter: "CodingMaster.Type=='".concat(payload.type, "' && CodingMaster.activestatus==true"),
+            sort: "CodingMaster.display ASC",
             return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type')"
           };
           _context16.next = 6;
@@ -17809,7 +17810,8 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
         case 0:
           payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
           _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
-          _context2.prev = 2;
+          debugger;
+          _context2.prev = 3;
           payloaddata = payload.payloaddata, enId = payload.enId;
 
           if (enId) {
@@ -17831,30 +17833,30 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
             }, payloaddata)];
           }
 
-          _context2.next = 7;
+          _context2.next = 8;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
-        case 7:
+        case 8:
           data = _context2.sent;
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
-        case 11:
-          _context2.prev = 11;
-          _context2.t0 = _context2["catch"](2);
+        case 12:
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](3);
           return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context2.t0.message
           })));
 
-        case 14:
+        case 15:
         case "end":
           return _context2.stop();
       }
     }
-  }, _callee2, null, [[2, 11]]);
+  }, _callee2, null, [[3, 12]]);
 })));
 var ORGANIZATION_REFERRAL_REGISTRATION = createAsyncThunk("OrganizationRegisterPatientApiSlice/ReferralTrx", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
   var payload,
@@ -18897,11 +18899,20 @@ var OrganizationRegisterPatientApiSlice$1 = OrganizationRegisterPatientApiSlice.
 var dashboardQuery = {
   totalAppointment: function totalAppointment(orgID, startDate, endDate, loginId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment",
+      //   filter: `Appointment.activestatus==true && Appointment.orgid=='${orgID}' && Appointment.start>=${startDate}  && Appointment.end<=${endDate} && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==${loginId} collect with count into length`,
+      //   return_fields: "{Count:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment",
-        filter: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, "  && Appointment.end<=").concat(endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==").concat(loginId, " collect with count into length"),
-        return_fields: "{Count:length}"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orgID, "' && Appointment.activestatus == true"),
+          "Encounter": "Appointment.id in Encounter.appointmentId &&  first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
+        },
+        "return_fields": "{Count:length}"
       },
       2: {
         db_name: dbName,
@@ -19026,14 +19037,16 @@ var dashboardQuery = {
 
     };
   },
-  patientWaitingTimeQuery: function patientWaitingTimeQuery(orgID, loginId) {
+  patientWaitingTimeQuery: function patientWaitingTimeQuery(orgID, loginId, startDate, endDate) {
     return {
       1: {
         db_name: dbName,
         queryid: "21fd3638-914e-41a8-b6e5-36459565595a",
         filter: {
           practid: loginId,
-          orgid: "".concat(orgID)
+          orgid: "".concat(orgID),
+          startDate: startDate,
+          endDate: endDate
         }
       },
       2: {
@@ -19041,7 +19054,9 @@ var dashboardQuery = {
         queryid: "4a129656-d8e2-4a3c-9626-7488903118f9",
         filter: {
           practid: loginId,
-          orgid: "".concat(orgID)
+          orgid: "".concat(orgID),
+          startDate: startDate,
+          endDate: endDate
         }
       } // 3: {},
 
@@ -19049,14 +19064,23 @@ var dashboardQuery = {
   },
   firstVisit: function firstVisit(orgID, startDate, endDate, loginId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment,Encounter",
+      //   filter: {
+      //     Appointment: `Appointment.activestatus==true && Appointment.start>= ${startDate} && Appointment.end<=${endDate} && document(Appointment.resourcecode).id ==${loginId} && Appointment.orgid=='${orgID}' `,
+      //     Encounter: `Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')  collect with count into length`,
+      //   },
+      //   return_fields: "{FirstVisitCount:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment,Encounter",
-        filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
-          Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')  collect with count into length"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orgID, "' && Appointment.activestatus == true"),
+          "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type) == 'first visit' && first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
         },
-        return_fields: "{FirstVisitCount:length}"
+        "return_fields": "{FirstVisitCount:length}"
       },
       2: {
         db_name: dbName,
@@ -19081,14 +19105,24 @@ var dashboardQuery = {
   },
   OtherVisit: function OtherVisit(orgID, startDate, endDate, loginId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment,Encounter",
+      //   filter: {
+      //     Appointment: `Appointment.activestatus==true && Appointment.start>= ${startDate}  && Appointment.end<=${endDate} && document(Appointment.resourcecode).id ==${loginId} && Appointment.orgid=='${orgID}' `,
+      //     Encounter:
+      //       "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')  collect with count into length",
+      //   },
+      //   return_fields: "{OtherVisitsCount:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment,Encounter",
-        filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, "  && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
-          Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')  collect with count into length"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orgID, "' && Appointment.activestatus == true"),
+          "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type) == 'other visits' && first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
         },
-        return_fields: "{OtherVisitsCount:length}"
+        "return_fields": "{OtherVisitsCount:length}"
       },
       2: {
         db_name: dbName,
@@ -19113,14 +19147,24 @@ var dashboardQuery = {
   },
   walkIns: function walkIns(orgID, startDate, endDate, loginId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment,Encounter",
+      //   filter: {
+      //     Appointment: `Appointment.activestatus==true && Appointment.start>= ${startDate} && Appointment.end<=${endDate} && document(Appointment.resourcecode).id ==${loginId} && Appointment.orgid=='${orgID}' `,
+      //     Encounter:
+      //       "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')  collect with count into length",
+      //   },
+      //   return_fields: "{WalkinCount:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment,Encounter",
-        filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
-          Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')  collect with count into length"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orgID, "' && Appointment.activestatus == true"),
+          "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type) == 'walkin' && first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
         },
-        return_fields: "{WalkinCount:length}"
+        "return_fields": "{WalkinCount:length}"
       },
       2: {
         db_name: dbName,
@@ -19145,14 +19189,24 @@ var dashboardQuery = {
   },
   newPatient: function newPatient(orgID, startDate, endDate, loginId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment,Encounter",
+      //   filter: {
+      //     Appointment: `Appointment.activestatus==true && Appointment.start>=${startDate}  && Appointment.end<=${endDate}  && document(Appointment.resourcecode).id ==${loginId} && Appointment.orgid=='${orgID}' `,
+      //     Encounter:
+      //       "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')  collect with count into length",
+      //   },
+      //   return_fields: "{NewPatientCount:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment,Encounter",
-        filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
-          Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')  collect with count into length"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orgID, "' && Appointment.activestatus == true"),
+          "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type) == 'new patient' && first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
         },
-        return_fields: "{NewPatientCount:length}"
+        "return_fields": "{NewPatientCount:length}"
       },
       2: {
         db_name: dbName,
@@ -19310,14 +19364,23 @@ var dashboardQuery = {
 var visitQuery = {
   checkedIn: function checkedIn(startDate, endDate, orgId, loginId, orGId) {
     return {
+      // 1: {
+      //   db_name: dbName,
+      //   entity: "Appointment,Encounter",
+      //   filter: {
+      //     Appointment: `Appointment.activestatus==true && Appointment.start>=${startDate}  && Appointment.end<=${endDate}  && document(Appointment.resourcecode).id ==${loginId} && Appointment.orgid=='${orGId}' `,
+      //     Encounter: `Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' collect with count into length`,
+      //   },
+      //   return_fields: "{CheckedIn:length}",
+      // },
       1: {
-        db_name: dbName,
-        entity: "Appointment,Encounter",
-        filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orGId, "' "),
-          Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' collect with count into length"
+        "db_name": dbName,
+        "entity": "Appointment,Encounter",
+        "filter": {
+          "Appointment": "Appointment.start >= ".concat(startDate, " && Appointment.end <= ").concat(endDate, "  && Appointment.orgid == '").concat(orGId, "' && Appointment.activestatus == true"),
+          "Encounter": "lower(first(document(Encounter.statushistory[*].status)[*].display)) == 'checked-in' && Appointment.id in Encounter.appointmentId &&  first((Encounter.participant)[*].Practitioner_id) == ".concat(loginId, " && Encounter.activestatus == true collect with count into length")
         },
-        return_fields: "{CheckedIn:length}"
+        "return_fields": "{CheckedIn:length}"
       },
       2: {
         db_name: dbName,
@@ -19627,6 +19690,8 @@ var PATIENT_WAITING_TIME = createAsyncThunk("dashboardApiSlice/patientWaitingTim
       orgId,
       roleId,
       loginId,
+      startDate,
+      endDate,
       data,
       arr,
       _args3 = arguments;
@@ -19638,32 +19703,33 @@ var PATIENT_WAITING_TIME = createAsyncThunk("dashboardApiSlice/patientWaitingTim
           payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
           _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
           _context3.prev = 2;
-          orgId = payload.orgId, roleId = payload.roleId, loginId = payload.loginId;
+          orgId = payload.orgId, roleId = payload.roleId, loginId = payload.loginId, startDate = payload.startDate, endDate = payload.endDate;
           _context3.next = 6;
           return fetchData$3({
-            body: JSON.stringify(dashboardQuery.patientWaitingTimeQuery(orgId, JSON.parse(parseInt(loginId)))[roleId])
+            body: JSON.stringify(dashboardQuery.patientWaitingTimeQuery(orgId, JSON.parse(parseInt(loginId)), JSON.parse(parseInt(startDate)), JSON.parse(parseInt(endDate)))[roleId])
           }, __baseUrl__);
 
         case 6:
           data = _context3.sent;
+          debugger;
           arr = [(_data$0$LessThan15$0$ = data === null || data === void 0 ? void 0 : (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$LessThan = _data$.LessThan15) === null || _data$$LessThan === void 0 ? void 0 : (_data$$LessThan$ = _data$$LessThan[0]) === null || _data$$LessThan$ === void 0 ? void 0 : _data$$LessThan$.LessThan15) !== null && _data$0$LessThan15$0$ !== void 0 ? _data$0$LessThan15$0$ : 0, (_data$0$MoreThan15$0$ = data === null || data === void 0 ? void 0 : (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$MoreThan = _data$2.MoreThan15) === null || _data$2$MoreThan === void 0 ? void 0 : (_data$2$MoreThan$ = _data$2$MoreThan[0]) === null || _data$2$MoreThan$ === void 0 ? void 0 : _data$2$MoreThan$.MoreThan15) !== null && _data$0$MoreThan15$0$ !== void 0 ? _data$0$MoreThan15$0$ : 0, (_data$0$GreaterThan = data === null || data === void 0 ? void 0 : (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$GreaterThan = _data$3.GreaterThan30) === null || _data$3$GreaterThan === void 0 ? void 0 : (_data$3$GreaterThan$ = _data$3$GreaterThan[0]) === null || _data$3$GreaterThan$ === void 0 ? void 0 : _data$3$GreaterThan$.GreaterThan30) !== null && _data$0$GreaterThan !== void 0 ? _data$0$GreaterThan : 0];
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: arr
           }));
 
-        case 11:
-          _context3.prev = 11;
+        case 12:
+          _context3.prev = 12;
           _context3.t0 = _context3["catch"](2);
           return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context3.t0.message
           })));
 
-        case 14:
+        case 15:
         case "end":
           return _context3.stop();
       }
     }
-  }, _callee3, null, [[2, 11]]);
+  }, _callee3, null, [[2, 12]]);
 })));
 var PATIENTSTATUSASSESSMENTPENDING = createAsyncThunk("dashboardApiSlice/patientStatusAssessmentPendin", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
   var payload,
@@ -21837,7 +21903,7 @@ var visitStatsApiActions = {
 var visitStatsApiSlice$1 = visitStatsApiSlice.reducer;
 
 var queries$a = {
-  relationship: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='RELATIONSHIP'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
+  relationship: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='RELATIONSHIP' && CodeableConceptMaster.status==true\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   symptoms: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"SymptomsMapping\",\n        \"return_fields\": \"SymptomsMapping\"\n        }"),
   Severity: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCSEVERITY'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   bodySite: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCBODYSITE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
@@ -22814,7 +22880,7 @@ var queries$9 = {
   Manifestation: "{\n         \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n         \"filter\": \"CodeableConceptMaster.Type=='MENIFESTATION'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n      }"),
   GradeType: "{\n         \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n         \"filter\": \"CodeableConceptMaster.Type=='GRADETYPE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n      }"),
   Assesment: "{\n         \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n         \"filter\": \"CodeableConceptMaster.Type=='ASSESMENTREF'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n      }"),
-  GradeCode: "{\n         \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n         \"filter\": \"CodeableConceptMaster.Type=='GRADETYPE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n      }"),
+  GradeCode: "{\n         \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n         \"filter\": \"CodeableConceptMaster.Type=='GRADECODE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n      }"),
   deleteDiagnosis: function deleteDiagnosis(id) {
     return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CA_Diagnosis\",\n        \"filter\": \"CA_Diagnosis._id =='").concat(id, "'\"\n    }");
   }
@@ -24276,8 +24342,8 @@ var generateJSON$6 = function generateJSON(payload, orgId) {
       "ivInfusionRateUOM": (_payload$ivInfusionRa = (_payload$ivInfusionRa2 = payload.ivInfusionRateUOM) === null || _payload$ivInfusionRa2 === void 0 ? void 0 : _payload$ivInfusionRa2.value) !== null && _payload$ivInfusionRa !== void 0 ? _payload$ivInfusionRa : "",
       "dosageDurationValue": payload.dosetime ? parseInt(payload.dosetime) : 0,
       "dosageDurationUOM": (_payload$doseOption$v = (_payload$doseOption = payload.doseOption) === null || _payload$doseOption === void 0 ? void 0 : _payload$doseOption.value) !== null && _payload$doseOption$v !== void 0 ? _payload$doseOption$v : "",
-      "UseAsFreqDose": payload.UseAsFreqDose ? getUseAsFreqDose$1(payload.UseAsFreqDose, payload.unitsTypes) : [],
-      "useAsTaperedDose": payload.useAsTaperedDose ? getuseAsTaperedDose$1(payload.useAsTaperedDose) : [],
+      // "UseAsFreqDose": payload.UseAsFreqDose ? getUseAsFreqDose(payload.UseAsFreqDose, payload.unitsTypes) : [],
+      // "useAsTaperedDose": payload.useAsTaperedDose ? getuseAsTaperedDose(payload.useAsTaperedDose) : [],
       "useAsSlidingScaleDose": payload.useAsSlidingScaleDose ? getuseAsSlidingScaleDose$1(payload.useAsSlidingScaleDose) : [],
       "occurStartDateTime": (_payload$occurStartDa = payload.occurStartDateTime) !== null && _payload$occurStartDa !== void 0 ? _payload$occurStartDa : 0,
       "occurEndDateTime": (_payload$occurEndDate = payload.occurEndDateTime) !== null && _payload$occurEndDate !== void 0 ? _payload$occurEndDate : 0,
@@ -24321,63 +24387,6 @@ var generateJSON$6 = function generateJSON(payload, orgId) {
   })];
 };
 
-var getUseAsFreqDose$1 = function getUseAsFreqDose(list, fre) {
-  var arr = [];
-  list.map(function (val, i) {
-    if ((fre === null || fre === void 0 ? void 0 : fre.label) === "EVERY THURSDAY AND FRIDAY") {
-      var _val$, _val$2, _val$2$unit$value, _val$3, _val$3$unit, _val$adminFrDay, _val$adminToDay, _val$4, _val$4$value;
-
-      arr.push({
-        // "frqGrpId": val.frqGrpId ?? 0,
-        "dispSeqNo": i + 1,
-        // "adminDate": val.adminDate ?? 0,
-        // "adminTime": "time",
-        "adminDosageQty": (val === null || val === void 0 ? void 0 : (_val$ = val[2]) === null || _val$ === void 0 ? void 0 : _val$.value) ? parseInt(val === null || val === void 0 ? void 0 : (_val$2 = val[2]) === null || _val$2 === void 0 ? void 0 : _val$2.value) : 0,
-        "adminDosageUOM": (_val$2$unit$value = val === null || val === void 0 ? void 0 : (_val$3 = val[2]) === null || _val$3 === void 0 ? void 0 : (_val$3$unit = _val$3.unit) === null || _val$3$unit === void 0 ? void 0 : _val$3$unit.value) !== null && _val$2$unit$value !== void 0 ? _val$2$unit$value : "",
-        "adminFrDay": (_val$adminFrDay = val.adminFrDay) !== null && _val$adminFrDay !== void 0 ? _val$adminFrDay : 0,
-        "adminToDay": (_val$adminToDay = val.adminToDay) !== null && _val$adminToDay !== void 0 ? _val$adminToDay : 0,
-        "adminDosageFreqCode": val === null || val === void 0 ? void 0 : (_val$4 = val[1]) === null || _val$4 === void 0 ? void 0 : (_val$4$value = _val$4.value) === null || _val$4$value === void 0 ? void 0 : _val$4$value.value
-      });
-    }
-
-    if ((fre === null || fre === void 0 ? void 0 : fre.label) === "Twice Daily") {
-      var _val$5, _val$6, _val$7, _val$1$unit$value, _val$8, _val$8$unit;
-
-      arr.push({
-        // "frqGrpId": val.frqGrpId ?? 0,
-        "dispSeqNo": i + 1,
-        // "adminDate": val.adminDate ?? 0,
-        "adminTime": val === null || val === void 0 ? void 0 : (_val$5 = val[0]) === null || _val$5 === void 0 ? void 0 : _val$5.value,
-        "adminDosageQty": (val === null || val === void 0 ? void 0 : (_val$6 = val[1]) === null || _val$6 === void 0 ? void 0 : _val$6.value) ? parseInt(val === null || val === void 0 ? void 0 : (_val$7 = val[1]) === null || _val$7 === void 0 ? void 0 : _val$7.value) : 0,
-        "adminDosageUOM": (_val$1$unit$value = val === null || val === void 0 ? void 0 : (_val$8 = val[1]) === null || _val$8 === void 0 ? void 0 : (_val$8$unit = _val$8.unit) === null || _val$8$unit === void 0 ? void 0 : _val$8$unit.value) !== null && _val$1$unit$value !== void 0 ? _val$1$unit$value : "" // "adminDosageInstruction": val.adminDosageInstruction ?? ""
-
-      });
-    }
-  });
-  return arr;
-};
-
-var getuseAsTaperedDose$1 = function getuseAsTaperedDose(list) {
-  var arr = [];
-  list.map(function (val, i) {
-    var _val$9, _val$10, _val$11, _val$12, _val$13, _val$14, _val$15, _val$16, _val$4$value$value, _val$17, _val$17$value, _val$18, _val$19, _val$5$unit$value, _val$20;
-
-    arr.push({
-      // "tdGrpId": val.tdGrpId ?? 0,
-      "dispSeqNo": i + 1,
-      "adminFrDay": (val === null || val === void 0 ? void 0 : (_val$9 = val[0]) === null || _val$9 === void 0 ? void 0 : _val$9.value) ? parseInt(val === null || val === void 0 ? void 0 : (_val$10 = val[0]) === null || _val$10 === void 0 ? void 0 : _val$10.value) : 0,
-      "adminToDay": (val === null || val === void 0 ? void 0 : (_val$11 = val[1]) === null || _val$11 === void 0 ? void 0 : _val$11.value) ? parseInt(val === null || val === void 0 ? void 0 : (_val$12 = val[1]) === null || _val$12 === void 0 ? void 0 : _val$12.value) : 0,
-      "adminFrDate": (val === null || val === void 0 ? void 0 : (_val$13 = val[2]) === null || _val$13 === void 0 ? void 0 : _val$13.value) ? moment$1(val === null || val === void 0 ? void 0 : (_val$14 = val[2]) === null || _val$14 === void 0 ? void 0 : _val$14.value, "DD-MM-YYYY,h:mm a").unix() : 0,
-      "adminToDate": (val === null || val === void 0 ? void 0 : (_val$15 = val[3]) === null || _val$15 === void 0 ? void 0 : _val$15.value) ? moment$1(val === null || val === void 0 ? void 0 : (_val$16 = val[3]) === null || _val$16 === void 0 ? void 0 : _val$16.value, "DD-MM-YYYY,h:mm a").unix() : 0,
-      "adminDosageFreqCode": (_val$4$value$value = val === null || val === void 0 ? void 0 : (_val$17 = val[4]) === null || _val$17 === void 0 ? void 0 : (_val$17$value = _val$17.value) === null || _val$17$value === void 0 ? void 0 : _val$17$value.value) !== null && _val$4$value$value !== void 0 ? _val$4$value$value : "",
-      "adminDosageStrength": (val === null || val === void 0 ? void 0 : (_val$18 = val[5]) === null || _val$18 === void 0 ? void 0 : _val$18.value) ? parseInt(val === null || val === void 0 ? void 0 : (_val$19 = val[5]) === null || _val$19 === void 0 ? void 0 : _val$19.value) : 0,
-      "adminDosageStrengthUOM": (_val$5$unit$value = val === null || val === void 0 ? void 0 : (_val$20 = val[5]) === null || _val$20 === void 0 ? void 0 : _val$20.unit.value) !== null && _val$5$unit$value !== void 0 ? _val$5$unit$value : "" // "adminDosageInstruction": val.adminDosageInstruction ?? ""
-
-    });
-  });
-  return arr;
-};
-
 var getuseAsSlidingScaleDose$1 = function getuseAsSlidingScaleDose(list) {
   var arr = [];
   list.map(function (val) {
@@ -25303,12 +25312,18 @@ var SAVE_VITALS = createAsyncThunk("VitalsApiSlice/saveVitals", /*#__PURE__*/_as
           stateDatakey = Object.keys(payload.dynamicValue).filter(function (e) {
             return /^[A-Z0-9]+$/.exec(e);
           });
-          _context4.next = 8;
+          stateValues.filter(function (val, i) {
+            // if (i % 2 === 0) {
+            if (!(val.endsWith("uom") || val.endsWith("error") || val.endsWith("normalorabnormal"))) {
+              stateDatakey.push(val);
+            }
+          });
+          _context4.next = 9;
           return fetchData$3({
             body: vitalsQueries.getOrganizationId(payload.orgid)
           }, __readDocumentUrl__);
 
-        case 8:
+        case 9:
           orgData = _context4.sent;
           component = [];
           stateDatakey.map(function (val) {
@@ -25331,19 +25346,19 @@ var SAVE_VITALS = createAsyncThunk("VitalsApiSlice/saveVitals", /*#__PURE__*/_as
             encounterid: payload.encounterid,
             component: component
           };
-          _context4.next = 14;
+          _context4.next = 15;
           return fetchData$3({
             body: JSON.stringify(vitalsQueries.savedPayload(payloadData, payload.editId))
           }, __uspsertUrl__);
 
-        case 14:
+        case 15:
           saveddata = _context4.sent;
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: saveddata
           }));
 
-        case 18:
-          _context4.prev = 18;
+        case 19:
+          _context4.prev = 19;
           _context4.t0 = _context4["catch"](2);
           // ;
           alert(_context4.t0.message);
@@ -25351,12 +25366,12 @@ var SAVE_VITALS = createAsyncThunk("VitalsApiSlice/saveVitals", /*#__PURE__*/_as
             message: _context4.t0.message
           })));
 
-        case 22:
+        case 23:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[2, 18]]);
+  }, _callee4, null, [[2, 19]]);
 })));
 var GET_VITALS_BASED_ENCOUNTER = createAsyncThunk("VitalsApiSlice/vitalsBasedEncounter", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
   var payload,
@@ -29301,10 +29316,16 @@ var GET_SPECIMENTYPE = createAsyncThunk("LabOrderApiSlice/get_specimentype", /*#
           _ref30 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref30.rejectWithValue;
           _context16.prev = 2;
           body = {
-            db_name: dbName,
-            entity: "CodeableConceptMaster",
-            filter: "CodeableConceptMaster.Type=='SPECIMENTYPE'",
-            return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
+            // db_name: dbName,
+            // entity: "CodeableConceptMaster",
+            // filter: "CodeableConceptMaster.Type=='SPECIMENTYPE'",
+            // return_fields:
+            // 	"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})",
+            db_name: "primarycare",
+            entity: "CodingMaster",
+            filter: "CodingMaster.Type == 'SPECIMENTYPE' && CodingMaster.status == true && CodingMaster.activestatus == true",
+            return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','activestatus')",
+            sort: "CodingMaster.display"
           };
           _context16.next = 6;
           return fetchData$3({
@@ -29317,11 +29338,11 @@ var GET_SPECIMENTYPE = createAsyncThunk("LabOrderApiSlice/get_specimentype", /*#
 
           if (Array.isArray(data.result)) {
             data.result.map(function (val, i) {
-              var _val$coding$8, _val$coding$9;
-
               returnData.push({
-                value: val === null || val === void 0 ? void 0 : (_val$coding$8 = val.coding[0]) === null || _val$coding$8 === void 0 ? void 0 : _val$coding$8.display,
-                label: val === null || val === void 0 ? void 0 : (_val$coding$9 = val.coding[0]) === null || _val$coding$9 === void 0 ? void 0 : _val$coding$9.display
+                // value: val?.coding[0]?.display,
+                // label: val?.coding[0]?.display,
+                value: val === null || val === void 0 ? void 0 : val.display,
+                label: val === null || val === void 0 ? void 0 : val._id
               });
             });
           }
@@ -29361,10 +29382,16 @@ var GET_UOM = createAsyncThunk("LabOrderApiSlice/get_uom", /*#__PURE__*/_asyncTo
           _ref32 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
           _context17.prev = 2;
           body = {
-            db_name: dbName,
-            entity: "CodeableConceptMaster",
-            filter: "CodeableConceptMaster.Type=='SPECIMENTYPE'",
-            return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
+            // db_name: dbName,
+            // entity: "CodeableConceptMaster",
+            // filter: "CodeableConceptMaster.Type=='SPECIMENTYPE'",
+            // return_fields:
+            // 	"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})",
+            db_name: "primarycare",
+            entity: "CodingMaster",
+            filter: "CodingMaster.Type == 'UOM' && CodingMaster.status == true && CodingMaster.activestatus == true",
+            return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','activestatus')",
+            sort: "CodingMaster.display"
           };
           _context17.next = 6;
           return fetchData$3({
@@ -29377,11 +29404,11 @@ var GET_UOM = createAsyncThunk("LabOrderApiSlice/get_uom", /*#__PURE__*/_asyncTo
 
           if (Array.isArray(data.result)) {
             data.result.map(function (val, i) {
-              var _val$coding$10, _val$coding$11;
-
               returnData.push({
-                value: val === null || val === void 0 ? void 0 : (_val$coding$10 = val.coding[0]) === null || _val$coding$10 === void 0 ? void 0 : _val$coding$10.display,
-                label: val === null || val === void 0 ? void 0 : (_val$coding$11 = val.coding[0]) === null || _val$coding$11 === void 0 ? void 0 : _val$coding$11.display
+                // value: val?.coding[0]?.display,
+                // label: val?.coding[0]?.display,
+                value: val === null || val === void 0 ? void 0 : val.display,
+                label: val === null || val === void 0 ? void 0 : val._id
               });
             });
           }
@@ -29437,11 +29464,11 @@ var GET_BODYSITE = createAsyncThunk("LabOrderApiSlice/get_bodysite", /*#__PURE__
 
           if (Array.isArray(data.result)) {
             data.result.map(function (val, i) {
-              var _val$coding$12, _val$coding$13;
+              var _val$coding$8, _val$coding$9;
 
               returnData.push({
-                value: val === null || val === void 0 ? void 0 : (_val$coding$12 = val.coding[0]) === null || _val$coding$12 === void 0 ? void 0 : _val$coding$12.display,
-                label: val === null || val === void 0 ? void 0 : (_val$coding$13 = val.coding[0]) === null || _val$coding$13 === void 0 ? void 0 : _val$coding$13.display
+                value: val === null || val === void 0 ? void 0 : (_val$coding$8 = val.coding[0]) === null || _val$coding$8 === void 0 ? void 0 : _val$coding$8.display,
+                label: val === null || val === void 0 ? void 0 : (_val$coding$9 = val.coding[0]) === null || _val$coding$9 === void 0 ? void 0 : _val$coding$9.display
               });
             });
           }
@@ -29497,11 +29524,11 @@ var GET_SPECCOLLMETHOD = createAsyncThunk("LabOrderApiSlice/get_speccollmethod",
 
           if (Array.isArray(data.result)) {
             data.result.map(function (val, i) {
-              var _val$coding$14, _val$coding$15;
+              var _val$coding$10, _val$coding$11;
 
               returnData.push({
-                value: val === null || val === void 0 ? void 0 : (_val$coding$14 = val.coding[0]) === null || _val$coding$14 === void 0 ? void 0 : _val$coding$14.display,
-                label: val === null || val === void 0 ? void 0 : (_val$coding$15 = val.coding[0]) === null || _val$coding$15 === void 0 ? void 0 : _val$coding$15.display
+                value: val === null || val === void 0 ? void 0 : (_val$coding$10 = val.coding[0]) === null || _val$coding$10 === void 0 ? void 0 : _val$coding$10.display,
+                label: val === null || val === void 0 ? void 0 : (_val$coding$11 = val.coding[0]) === null || _val$coding$11 === void 0 ? void 0 : _val$coding$11.display
               });
             });
           }
@@ -30140,10 +30167,15 @@ var GET_INDICATION = createAsyncThunk("LabOrderApiSlice/get_indication", /*#__PU
           _ref56 = _args29.length > 1 ? _args29[1] : undefined, rejectWithValue = _ref56.rejectWithValue;
           _context29.prev = 2;
           body = {
-            "db_name": dbName,
-            "entity": "CodingMaster",
-            "filter": "CodingMaster.Type=='INDICATIONREASON' && CodingMaster.activestatus==true && CodingMaster.status==true",
-            "return_fields": "KEEP(CodingMaster,'_id','id','_key','code','display','Type')"
+            // "db_name": dbName,
+            // "entity": "CodingMaster",
+            // "filter": "CodingMaster.Type=='INDICATIONREASON' && CodingMaster.activestatus==true && CodingMaster.status==true",
+            // "return_fields": "KEEP(CodingMaster,'_id','id','_key','code','display','Type')"
+            db_name: "primarycare",
+            entity: "CodingMaster",
+            filter: "CodingMaster.Type == 'INDICATIONREASON' && CodingMaster.status == true && CodingMaster.activestatus == true",
+            return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','activestatus')",
+            sort: "CodingMaster.display"
           };
           _context29.next = 6;
           return fetchData$3({
@@ -30669,7 +30701,13 @@ var queries$5 = {
   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    }"),
   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: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='PRIORITY'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n    }"),
+  // Priority: `{
+  //       "db_name": "${dbName}",
+  //       "entity": "CodeableConceptMaster",
+  //       "filter": "CodeableConceptMaster.Type=='PRIORITY'",
+  //       "return_fields": "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
+  //   }`,
+  Priority: "{\n      \"db_name\": \"".concat(dbName, "\",\n      \"entity\": \"CodingMaster\",\n      \"filter\": \"CodingMaster.Type == 'PRIORITY' && CodingMaster.status == true && CodingMaster.activestatus == true\",\n      \"return_fields\": \"KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','shortdesc','longdesc','activestatus')\",\n      \"sort\": \"CodingMaster.display\"\n  }"),
   DrugCategory: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugCategory\",\n        \"return_fields\": \"DrugCategory\"\n    }"),
   OrderNature: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='ORDERNATURE'&& CodeableConceptMaster.status==true\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n    }"),
   OrderMode: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='ORDERMODE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n    }"),
@@ -31433,13 +31471,13 @@ var PRIORITY_MASTER = createAsyncThunk("MedicationMastersSlice/Priority_masters"
           data = _context14.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$_id, _val$coding2, _val$coding2$, _val$coding$0$display, _val$coding3, _val$coding3$;
+            var _val$_id, _val$_id2, _val$display, _val$id;
 
             arr.push({
-              value: val._id,
-              masterId: (_val$coding$0$_id = val === null || val === void 0 ? void 0 : (_val$coding2 = val.coding) === null || _val$coding2 === void 0 ? void 0 : (_val$coding2$ = _val$coding2[0]) === null || _val$coding2$ === void 0 ? void 0 : _val$coding2$._id) !== null && _val$coding$0$_id !== void 0 ? _val$coding$0$_id : "",
-              label: (_val$coding$0$display = val === null || val === void 0 ? void 0 : (_val$coding3 = val.coding) === null || _val$coding3 === void 0 ? void 0 : (_val$coding3$ = _val$coding3[0]) === null || _val$coding3$ === void 0 ? void 0 : _val$coding3$.display) !== null && _val$coding$0$display !== void 0 ? _val$coding$0$display : "",
-              id: val.id
+              value: (_val$_id = val._id) !== null && _val$_id !== void 0 ? _val$_id : "",
+              masterId: (_val$_id2 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id2 !== void 0 ? _val$_id2 : "",
+              label: (_val$display = val === null || val === void 0 ? void 0 : val.display) !== null && _val$display !== void 0 ? _val$display : "",
+              id: (_val$id = val.id) !== null && _val$id !== void 0 ? _val$id : ""
             });
           });
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -31534,11 +31572,11 @@ var ORDERNATURE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderNature_ma
           data = _context16.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$display2, _val$coding4;
+            var _val$coding$0$display, _val$coding2;
 
             arr.push({
               value: val._id,
-              label: (_val$coding$0$display2 = (_val$coding4 = val.coding) === null || _val$coding4 === void 0 ? void 0 : _val$coding4[0].display) !== null && _val$coding$0$display2 !== void 0 ? _val$coding$0$display2 : "",
+              label: (_val$coding$0$display = (_val$coding2 = val.coding) === null || _val$coding2 === void 0 ? void 0 : _val$coding2[0].display) !== null && _val$coding$0$display !== void 0 ? _val$coding$0$display : "",
               id: val.id
             });
           });
@@ -31584,11 +31622,11 @@ var ORDERMODE_MASTER = createAsyncThunk("MedicationMastersSlice/OrderMode_master
           data = _context17.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$display3, _val$coding5;
+            var _val$coding$0$display2, _val$coding3;
 
             arr.push({
               value: val._id,
-              label: (_val$coding$0$display3 = (_val$coding5 = val.coding) === null || _val$coding5 === void 0 ? void 0 : _val$coding5[0].display) !== null && _val$coding$0$display3 !== void 0 ? _val$coding$0$display3 : "",
+              label: (_val$coding$0$display2 = (_val$coding3 = val.coding) === null || _val$coding3 === void 0 ? void 0 : _val$coding3[0].display) !== null && _val$coding$0$display2 !== void 0 ? _val$coding$0$display2 : "",
               id: val.id
             });
           });
@@ -31734,11 +31772,11 @@ var REASONCODE_MASTER = createAsyncThunk("MedicationMastersSlice/Reasoncode_mast
           data = _context20.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$display;
+            var _val$display2;
 
             arr.push({
               value: val._id,
-              label: (_val$display = val.display) !== null && _val$display !== void 0 ? _val$display : "",
+              label: (_val$display2 = val.display) !== null && _val$display2 !== void 0 ? _val$display2 : "",
               id: val.id
             });
           });
@@ -31834,12 +31872,12 @@ var PATIENT_INSTRUCTIONS_MASTER = createAsyncThunk("MedicationMastersSlice/Patie
           data = _context22.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$code, _val$coding6, _val$coding6$, _val$coding$0$display4, _val$coding7, _val$coding7$;
+            var _val$coding$0$code, _val$coding4, _val$coding4$, _val$coding$0$display3, _val$coding5, _val$coding5$;
 
             arr.push({
               value: val._id,
-              label: (_val$coding$0$code = (_val$coding6 = val.coding) === null || _val$coding6 === void 0 ? void 0 : (_val$coding6$ = _val$coding6[0]) === null || _val$coding6$ === void 0 ? void 0 : _val$coding6$.code) !== null && _val$coding$0$code !== void 0 ? _val$coding$0$code : "",
-              display: (_val$coding$0$display4 = (_val$coding7 = val.coding) === null || _val$coding7 === void 0 ? void 0 : (_val$coding7$ = _val$coding7[0]) === null || _val$coding7$ === void 0 ? void 0 : _val$coding7$.display) !== null && _val$coding$0$display4 !== void 0 ? _val$coding$0$display4 : "",
+              label: (_val$coding$0$code = (_val$coding4 = val.coding) === null || _val$coding4 === void 0 ? void 0 : (_val$coding4$ = _val$coding4[0]) === null || _val$coding4$ === void 0 ? void 0 : _val$coding4$.code) !== null && _val$coding$0$code !== void 0 ? _val$coding$0$code : "",
+              display: (_val$coding$0$display3 = (_val$coding5 = val.coding) === null || _val$coding5 === void 0 ? void 0 : (_val$coding5$ = _val$coding5[0]) === null || _val$coding5$ === void 0 ? void 0 : _val$coding5$.display) !== null && _val$coding$0$display3 !== void 0 ? _val$coding$0$display3 : "",
               id: val.id
             });
           });
@@ -31885,13 +31923,13 @@ var STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/status_masters", /*
           data = _context23.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$display5, _val$coding8, _val$coding8$, _val$coding$0$code2, _val$coding9, _val$coding9$;
+            var _val$coding$0$display4, _val$coding6, _val$coding6$, _val$coding$0$code2, _val$coding7, _val$coding7$;
 
             arr.push({
               value: val._id,
-              label: (_val$coding$0$display5 = (_val$coding8 = val.coding) === null || _val$coding8 === void 0 ? void 0 : (_val$coding8$ = _val$coding8[0]) === null || _val$coding8$ === void 0 ? void 0 : _val$coding8$.display) !== null && _val$coding$0$display5 !== void 0 ? _val$coding$0$display5 : "",
+              label: (_val$coding$0$display4 = (_val$coding6 = val.coding) === null || _val$coding6 === void 0 ? void 0 : (_val$coding6$ = _val$coding6[0]) === null || _val$coding6$ === void 0 ? void 0 : _val$coding6$.display) !== null && _val$coding$0$display4 !== void 0 ? _val$coding$0$display4 : "",
               id: val.id,
-              code: (_val$coding$0$code2 = val === null || val === void 0 ? void 0 : (_val$coding9 = val.coding) === null || _val$coding9 === void 0 ? void 0 : (_val$coding9$ = _val$coding9[0]) === null || _val$coding9$ === void 0 ? void 0 : _val$coding9$.code) !== null && _val$coding$0$code2 !== void 0 ? _val$coding$0$code2 : ""
+              code: (_val$coding$0$code2 = val === null || val === void 0 ? void 0 : (_val$coding7 = val.coding) === null || _val$coding7 === void 0 ? void 0 : (_val$coding7$ = _val$coding7[0]) === null || _val$coding7$ === void 0 ? void 0 : _val$coding7$.code) !== null && _val$coding$0$code2 !== void 0 ? _val$coding$0$code2 : ""
             });
           });
           return _context23.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -32274,13 +32312,13 @@ var WORKFLOW_STATUS_MASTER = createAsyncThunk("MedicationMastersSlice/workflow_s
           data = _context31.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$coding$0$display6, _val$coding10, _val$coding10$, _val$coding$0$code3, _val$coding11, _val$coding11$;
+            var _val$coding$0$display5, _val$coding8, _val$coding8$, _val$coding$0$code3, _val$coding9, _val$coding9$;
 
             arr.push({
               value: val._id,
-              label: (_val$coding$0$display6 = (_val$coding10 = val.coding) === null || _val$coding10 === void 0 ? void 0 : (_val$coding10$ = _val$coding10[0]) === null || _val$coding10$ === void 0 ? void 0 : _val$coding10$.display) !== null && _val$coding$0$display6 !== void 0 ? _val$coding$0$display6 : "",
+              label: (_val$coding$0$display5 = (_val$coding8 = val.coding) === null || _val$coding8 === void 0 ? void 0 : (_val$coding8$ = _val$coding8[0]) === null || _val$coding8$ === void 0 ? void 0 : _val$coding8$.display) !== null && _val$coding$0$display5 !== void 0 ? _val$coding$0$display5 : "",
               id: val.id,
-              code: (_val$coding$0$code3 = val === null || val === void 0 ? void 0 : (_val$coding11 = val.coding) === null || _val$coding11 === void 0 ? void 0 : (_val$coding11$ = _val$coding11[0]) === null || _val$coding11$ === void 0 ? void 0 : _val$coding11$.code) !== null && _val$coding$0$code3 !== void 0 ? _val$coding$0$code3 : ""
+              code: (_val$coding$0$code3 = val === null || val === void 0 ? void 0 : (_val$coding9 = val.coding) === null || _val$coding9 === void 0 ? void 0 : (_val$coding9$ = _val$coding9[0]) === null || _val$coding9$ === void 0 ? void 0 : _val$coding9$.code) !== null && _val$coding$0$code3 !== void 0 ? _val$coding$0$code3 : ""
             });
           });
           return _context31.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -33195,9 +33233,14 @@ var queries$4 = {
   // Encounter/10046
   treatment_indicate: function treatment_indicate() {
     return {
-      db_name: "".concat(dbName),
-      entity: "ReasonMaster",
-      return_fields: "ReasonMaster"
+      // db_name: `${dbName}`,
+      // entity: "ReasonMaster",
+      // return_fields: "ReasonMaster",
+      db_name: "primarycare",
+      entity: "CodingMaster",
+      filter: "CodingMaster.Type == 'INDICATIONREASON' && CodingMaster.status == true && CodingMaster.activestatus == true",
+      return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','activestatus')",
+      sort: "CodingMaster.display"
     };
   },
   treatment_instruction: function treatment_instruction() {
@@ -34398,11 +34441,11 @@ var TREATMENT_INDICATE = createAsyncThunk("TreatmentSlice/getorderindicate", /*#
           data = _context13.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$ReasonDesc, _val$ReasonCode;
-
             arr.push({
-              label: (_val$ReasonDesc = val === null || val === void 0 ? void 0 : val.ReasonDesc) !== null && _val$ReasonDesc !== void 0 ? _val$ReasonDesc : "",
-              value: (_val$ReasonCode = val === null || val === void 0 ? void 0 : val.ReasonCode) !== null && _val$ReasonCode !== void 0 ? _val$ReasonCode : ""
+              // label: val?.ReasonDesc ?? "",
+              // value: val?.ReasonCode ?? "",
+              value: val === null || val === void 0 ? void 0 : val._id,
+              label: val === null || val === void 0 ? void 0 : val.display
             });
           });
           return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -35109,9 +35152,14 @@ var queries$3 = (_queries = {
   },
   treatment_indicate: function treatment_indicate() {
     return {
-      db_name: "".concat(dbName),
-      entity: "ReasonMaster",
-      return_fields: "ReasonMaster"
+      // db_name: `${dbName}`,
+      // entity: "ReasonMaster",
+      // return_fields: "ReasonMaster",
+      db_name: "primarycare",
+      entity: "CodingMaster",
+      filter: "CodingMaster.Type == 'INDICATIONREASON' && CodingMaster.status == true && CodingMaster.activestatus == true",
+      return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','activestatus')",
+      sort: "CodingMaster.display"
     };
   },
   treatment_instruction: function treatment_instruction() {
@@ -36381,11 +36429,11 @@ var RAD_INDICATE = createAsyncThunk("RadiologySlice/getorderindicate", /*#__PURE
           data = _context14.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$ReasonDesc, _val$ReasonDesc2;
-
             arr.push({
-              label: (_val$ReasonDesc = val === null || val === void 0 ? void 0 : val.ReasonDesc) !== null && _val$ReasonDesc !== void 0 ? _val$ReasonDesc : "",
-              value: (_val$ReasonDesc2 = val === null || val === void 0 ? void 0 : val.ReasonDesc) !== null && _val$ReasonDesc2 !== void 0 ? _val$ReasonDesc2 : ""
+              // label: val?.ReasonDesc ?? "",
+              // value: val?.ReasonDesc ?? "",
+              value: val === null || val === void 0 ? void 0 : val._id,
+              label: val === null || val === void 0 ? void 0 : val.display
             });
           });
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38790,10 +38838,9 @@ var clinicQuery = {
   readClinicData: function readClinicData(key) {
     return {
       db_name: dbName,
-      entity: "LocationMaster,LocationMaster_CodeableConceptMaster_E,CodeableConceptMaster_CodingMaster_E,LocationMaster_LocationRoleType_E,LocationMaster_Organization_E,Organization_CodeableConceptMaster_E,LocationMaster_ContactPointMaster_E,LocationMaster_AddressMaster_E,LocationMaster_AttachmentMaster_E",
-      filter: "LocationMaster.activestatus==true && LocationMaster._id=='".concat(key, "'"),
-      isTraversal: "true",
-      return_fields: "{vertices:v,orginatedata:LocationMaster}"
+      entity: "LocationMaster",
+      filter: "LocationMaster._id == '".concat(key, "' && LocationMaster.activestatus==true"),
+      return_fields: "merge(LocationMaster,{operationalStatus:document(LocationMaster.operationalStatus)},{managingOrgEntityType:(for managingOrgEntityType in document(to_array(LocationMaster.managingOrgEntityType)) return merge(managingOrgEntityType,{coding:document(managingOrgEntityType.coding)}))}, {parentLocationID_desc:document(LocationMaster.parentLocationID_desc)},{address:document(LocationMaster.address)},{locationType:merge(document(LocationMaster.locationType),{coding:document(document(LocationMaster.locationType).coding)})},{managingOrgID:(for managingOrgID in document(to_array(LocationMaster.managingOrgID)) return managingOrgID)},{locationRoletype:document(LocationMaster.locationRoletype)},{specialty:(for code in to_array(LocationMaster.specialty) return document(code))},{photo:document(LocationMaster.photo)}, {pharmacy:(for ph in to_array(LocationMaster.pharmacy) return merge(ph,{inventorySubStore:document(ph.inventorySubStore)}))}, {telecom:(for tel in document(LocationMaster.telecom) return merge(tel,{use:document(tel.use)},{rank:document(tel.rank)},{system:document(tel.system)}))})"
     };
   }
 };
@@ -39496,7 +39543,8 @@ var query$4 = {
         Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID")
       },
-      "return_fields": "{Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})}"
+      // "return_fields": "{Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})}"
+      return_fields: "merge({Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})},{Encounter:(for Encounter in Encounter filter Encounter.appointmentId any == Appointment.id return merge({visit_type:Encounter.visit_type},{encounter_no:Encounter.encounter_no}))})"
     };
   },
   getFirstVisitsNurse: function getFirstVisitsNurse(data) {
@@ -39568,7 +39616,8 @@ var query$4 = {
         //     "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'",
 
       },
-      "return_fields": "{Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})}"
+      // "return_fields": "{Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})}"
+      return_fields: "merge({Appointment:merge(Appointment,{orgid:document(Appointment.orgid)},{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)},{telecom:document(per.telecom)},{MRN:(for pat in Patient filter pat.personID==per.Id return pat.alias)},{age:(for pat in Patient filter pat.personID==per.Id return pat.age)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})},{Encounter:(for Encounter in Encounter filter Encounter.appointmentId any == Appointment.id return merge({visit_type:Encounter.visit_type},{encounter_no:Encounter.encounter_no}))})"
     };
   },
   getFirstVisitsDoctor: function getFirstVisitsDoctor(data) {
@@ -40257,7 +40306,7 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
         case 5:
           data = _context7.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result7 = data.result) === null || _data$result7 === void 0 ? void 0 : _data$result7.map(function (_) {
-            var _$Appointment48, _$Appointment48$Perso, _$Appointment48$Perso2, _$Appointment48$Perso3, _$Appointment49, _$Appointment49$Perso, _$Appointment49$Perso2, _$Appointment50, _$Appointment50$Perso, _$Appointment50$Perso2, _$Appointment50$Perso3, _$Appointment51, _$Appointment51$Perso, _$Appointment51$Perso2, _$Appointment51$Perso3, _$Appointment51$Perso4, _$Appointment52, _$Appointment52$Perso, _$Appointment52$Perso2, _$Appointment52$Perso3, _$Appointment52$Perso4, _$Appointment$appoint2, _$Appointment53, _$Appointment54, _$Appointment55, _$Appointment56, _$Appointment57, _$Appointment58, _$Appointment59;
+            var _$Appointment48, _$Appointment48$Perso, _$Appointment48$Perso2, _$Appointment48$Perso3, _$Appointment49, _$Appointment49$Perso, _$Appointment49$Perso2, _$Appointment49$Perso3, _$Appointment50, _$Appointment50$Perso, _$Appointment50$Perso2, _$Appointment51, _$Appointment51$Perso, _$Appointment51$Perso2, _$Appointment51$Perso3, _$Appointment51$Perso4, _$Appointment52, _$Appointment52$Perso, _$Appointment52$Perso2, _$Appointment52$Perso3, _$Appointment52$Perso4, _$Appointment53, _$Appointment54, _$Appointment55, _$Appointment56, _$Appointment57, _$Encounter$0$visit_t, _$Encounter36, _$Encounter36$, _$Appointment58, _$Appointment58$resou, _$Appointment59, _$Appointment59$Speci, _$Appointment59$Speci2, _$Appointment59$Speci3, _$Appointment59$Speci4, _$Appointment60, _$Appointment60$orgid, _$Appointment61;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40266,15 +40315,14 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
               //   )
               //   : "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]) || {}),
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$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$Perso2.birthDay),
-              mrn: (_$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$Perso3 = _$Appointment50$Perso2.MRN) === null || _$Appointment50$Perso3 === void 0 ? void 0 : _$Appointment50$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",
               contact: ((_$Appointment51 = _.Appointment) === null || _$Appointment51 === void 0 ? void 0 : (_$Appointment51$Perso = _$Appointment51.PersonID) === null || _$Appointment51$Perso === void 0 ? void 0 : (_$Appointment51$Perso2 = _$Appointment51$Perso[0]) === null || _$Appointment51$Perso2 === void 0 ? void 0 : (_$Appointment51$Perso3 = _$Appointment51$Perso2.telecom) === null || _$Appointment51$Perso3 === void 0 ? void 0 : (_$Appointment51$Perso4 = _$Appointment51$Perso3[0]) === null || _$Appointment51$Perso4 === void 0 ? void 0 : _$Appointment51$Perso4.value) ? JSON.stringify((_$Appointment52 = _.Appointment) === null || _$Appointment52 === void 0 ? void 0 : (_$Appointment52$Perso = _$Appointment52.PersonID) === null || _$Appointment52$Perso === void 0 ? void 0 : (_$Appointment52$Perso2 = _$Appointment52$Perso[0]) === null || _$Appointment52$Perso2 === void 0 ? void 0 : (_$Appointment52$Perso3 = _$Appointment52$Perso2.telecom) === null || _$Appointment52$Perso3 === void 0 ? void 0 : (_$Appointment52$Perso4 = _$Appointment52$Perso3[0]) === null || _$Appointment52$Perso4 === void 0 ? void 0 : _$Appointment52$Perso4.value) : "",
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
-              visitType: (_$Appointment$appoint2 = _ === null || _ === void 0 ? void 0 : (_$Appointment53 = _.Appointment) === null || _$Appointment53 === void 0 ? void 0 : _$Appointment53.appointmentType) !== null && _$Appointment$appoint2 !== void 0 ? _$Appointment$appoint2 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment53 = _.Appointment) === null || _$Appointment53 === void 0 ? void 0 : _$Appointment53.appno) || "",
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment54 = _.Appointment) === null || _$Appointment54 === void 0 ? void 0 : _$Appointment54.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment55 = _.Appointment) === null || _$Appointment55 === void 0 ? void 0 : _$Appointment55.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment56 = _.Appointment) === null || _$Appointment56 === void 0 ? void 0 : _$Appointment56.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment57 = _.Appointment) === null || _$Appointment57 === void 0 ? void 0 : _$Appointment57.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment58 = _.Appointment) === null || _$Appointment58 === void 0 ? void 0 : _$Appointment58.appno) || "",
               // speciality: JSON.stringify({
               //   speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
               //     return spl?.coding?.[0]?.display;
@@ -40282,7 +40330,11 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
               //   clinic: _?.Appointment?.orgid?.name ?? ""
               // }),
               // clinic: _?.practitioner_details?.[0]?.clinic || "",
-              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment59 = _.Appointment) === null || _$Appointment59 === void 0 ? void 0 : _$Appointment59.appstatus) || "",
+              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),
+              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) || "",
               // "View Patient": true,
               // Attend: true,
               // action: true,
@@ -40339,7 +40391,7 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
         case 5:
           data = _context8.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result8 = data.result) === null || _data$result8 === void 0 ? void 0 : _data$result8.map(function (_) {
-            var _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$visit_type, _$appointmentId2, _$appointmentId2$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$status;
+            var _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$patient_id$0$teleco, _$patient_id3, _$patient_id3$, _$patient_id3$$teleco, _$patient_id3$$teleco2, _$appointmentId2, _$appointmentId2$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$visit_type, _$practitioner_detail, _$practitioner_detail2, _$practitioner_detail3, _$appointmentId7, _$appointmentId7$, _$appointmentId7$$Spe, _$appointmentId7$$Spe2, _$appointmentId7$$Spe3, _$appointmentId7$$Spe4, _$practitioner_detail4, _$practitioner_detail5, _$status;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40376,9 +40428,13 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
               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]) || {}),
               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 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : _$appointmentId2$.appno) || "",
+              date: "".concat((_ === 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, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.start, "hh:mm A") : ""),
               visitType: (_$visit_type = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type !== void 0 ? _$visit_type : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : _$appointmentId2$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.appno) || "",
+              practitionerName: (_$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 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : (_$appointmentId7$$Spe = _$appointmentId7$.SpecialtyID) === null || _$appointmentId7$$Spe === void 0 ? void 0 : (_$appointmentId7$$Spe2 = _$appointmentId7$$Spe[0]) === null || _$appointmentId7$$Spe2 === void 0 ? void 0 : (_$appointmentId7$$Spe3 = _$appointmentId7$$Spe2.coding) === null || _$appointmentId7$$Spe3 === void 0 ? void 0 : (_$appointmentId7$$Spe4 = _$appointmentId7$$Spe3[0]) === null || _$appointmentId7$$Spe4 === void 0 ? void 0 : _$appointmentId7$$Spe4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail4 = _.practitioner_details) === null || _$practitioner_detail4 === void 0 ? void 0 : (_$practitioner_detail5 = _$practitioner_detail4[0]) === null || _$practitioner_detail5 === void 0 ? void 0 : _$practitioner_detail5.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display) || "",
               action: true // genderData: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
@@ -40441,7 +40497,7 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
         case 5:
           data = _context9.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result9 = data.result) === null || _data$result9 === void 0 ? void 0 : _data$result9.map(function (_) {
-            var _$patient_id3, _$patient_id3$, _$patient_id3$$name, _$patient_id4, _$patient_id4$, _$appointmentId7, _$appointmentId7$, _$appointmentId7$$Per, _$appointmentId7$$Per2, _$visit_type2, _$appointmentId8, _$appointmentId8$, _$appointmentId9, _$appointmentId9$, _$appointmentId10, _$appointmentId10$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$status2;
+            var _$patient_id4, _$patient_id4$, _$patient_id4$$name, _$patient_id5, _$patient_id5$, _$appointmentId8, _$appointmentId8$, _$appointmentId8$$Per, _$appointmentId8$$Per2, _$patient_id$0$teleco2, _$patient_id6, _$patient_id6$, _$patient_id6$$teleco, _$patient_id6$$teleco2, _$appointmentId9, _$appointmentId9$, _$appointmentId10, _$appointmentId10$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$appointmentId13, _$appointmentId13$, _$visit_type2, _$practitioner_detail6, _$practitioner_detail7, _$practitioner_detail8, _$appointmentId14, _$appointmentId14$, _$appointmentId14$$Sp, _$appointmentId14$$Sp2, _$appointmentId14$$Sp3, _$appointmentId14$$Sp4, _$practitioner_detail9, _$practitioner_detail10, _$status2;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40480,12 +40536,13 @@ 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_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : (_$patient_id3$$name = _$patient_id3$.name) === null || _$patient_id3$$name === void 0 ? void 0 : _$patient_id3$$name[0]) || {}),
-              mrn: (_ === 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$.alias) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : (_$appointmentId7$$Per = _$appointmentId7$.PersonID) === null || _$appointmentId7$$Per === void 0 ? void 0 : (_$appointmentId7$$Per2 = _$appointmentId7$$Per[0]) === null || _$appointmentId7$$Per2 === void 0 ? void 0 : _$appointmentId7$$Per2.birthDay),
+              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]) || {}),
+              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 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.appno) || "",
+              date: "".concat((_ === 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, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : _$appointmentId12$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : _$appointmentId13$.start, "hh:mm A") : ""),
               visitType: (_$visit_type2 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type2 !== void 0 ? _$visit_type2 : "",
-              date: "".concat((_ === 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") : "", ",").concat((_ === 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") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : _$appointmentId12$.appno) || "",
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -40500,6 +40557,9 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              practitionerName: (_$practitioner_detail6 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail7 = _.practitioner_details) === null || _$practitioner_detail7 === void 0 ? void 0 : (_$practitioner_detail8 = _$practitioner_detail7[0]) === null || _$practitioner_detail8 === void 0 ? void 0 : _$practitioner_detail8.id_name) !== null && _$practitioner_detail6 !== void 0 ? _$practitioner_detail6 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : (_$appointmentId14$$Sp = _$appointmentId14$.SpecialtyID) === null || _$appointmentId14$$Sp === void 0 ? void 0 : (_$appointmentId14$$Sp2 = _$appointmentId14$$Sp[0]) === null || _$appointmentId14$$Sp2 === void 0 ? void 0 : (_$appointmentId14$$Sp3 = _$appointmentId14$$Sp2.coding) === null || _$appointmentId14$$Sp3 === void 0 ? void 0 : (_$appointmentId14$$Sp4 = _$appointmentId14$$Sp3[0]) === null || _$appointmentId14$$Sp4 === void 0 ? void 0 : _$appointmentId14$$Sp4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail9 = _.practitioner_details) === null || _$practitioner_detail9 === void 0 ? void 0 : (_$practitioner_detail10 = _$practitioner_detail9[0]) === null || _$practitioner_detail10 === void 0 ? void 0 : _$practitioner_detail10.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status2 = _.status) === null || _$status2 === void 0 ? void 0 : _$status2.display) || "",
               action: true
             };
@@ -40546,7 +40606,7 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
         case 5:
           data = _context10.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result10 = data.result) === null || _data$result10 === void 0 ? void 0 : _data$result10.map(function (_) {
-            var _$patient_id5, _$patient_id5$, _$patient_id5$$name, _$patient_id6, _$patient_id6$, _$appointmentId13, _$appointmentId13$, _$appointmentId13$$Pe, _$appointmentId13$$Pe2, _$visit_type3, _$appointmentId14, _$appointmentId14$, _$appointmentId15, _$appointmentId15$, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$status3;
+            var _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$appointmentId15, _$appointmentId15$, _$appointmentId15$$Pe, _$appointmentId15$$Pe2, _$patient_id$0$teleco3, _$patient_id9, _$patient_id9$, _$patient_id9$$teleco, _$patient_id9$$teleco2, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$appointmentId19, _$appointmentId19$, _$appointmentId20, _$appointmentId20$, _$visit_type3, _$practitioner_detail11, _$practitioner_detail12, _$practitioner_detail13, _$appointmentId21, _$appointmentId21$, _$appointmentId21$$Sp, _$appointmentId21$$Sp2, _$appointmentId21$$Sp3, _$appointmentId21$$Sp4, _$practitioner_detail14, _$practitioner_detail15, _$status3;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40587,12 +40647,13 @@ 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_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : (_$patient_id5$ = _$patient_id5[0]) === null || _$patient_id5$ === void 0 ? void 0 : (_$patient_id5$$name = _$patient_id5$.name) === null || _$patient_id5$$name === void 0 ? void 0 : _$patient_id5$$name[0]) || {}),
-              mrn: (_ === 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$.alias) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : (_$appointmentId13$$Pe = _$appointmentId13$.PersonID) === null || _$appointmentId13$$Pe === void 0 ? void 0 : (_$appointmentId13$$Pe2 = _$appointmentId13$$Pe[0]) === null || _$appointmentId13$$Pe2 === void 0 ? void 0 : _$appointmentId13$$Pe2.birthDay),
+              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]) || {}),
+              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: (_$patient_id$0$teleco3 = _ === 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) !== null && _$patient_id$0$teleco3 !== void 0 ? _$patient_id$0$teleco3 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.appno) || "",
+              date: "".concat((_ === 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, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : _$appointmentId19$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start, "hh:mm A") : ""),
               visitType: (_$visit_type3 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type3 !== void 0 ? _$visit_type3 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : _$appointmentId14$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.appno) || "",
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -40607,6 +40668,9 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              practitionerName: (_$practitioner_detail11 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail12 = _.practitioner_details) === null || _$practitioner_detail12 === void 0 ? void 0 : (_$practitioner_detail13 = _$practitioner_detail12[0]) === null || _$practitioner_detail13 === void 0 ? void 0 : _$practitioner_detail13.id_name) !== null && _$practitioner_detail11 !== void 0 ? _$practitioner_detail11 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : (_$appointmentId21$$Sp = _$appointmentId21$.SpecialtyID) === null || _$appointmentId21$$Sp === void 0 ? void 0 : (_$appointmentId21$$Sp2 = _$appointmentId21$$Sp[0]) === null || _$appointmentId21$$Sp2 === void 0 ? void 0 : (_$appointmentId21$$Sp3 = _$appointmentId21$$Sp2.coding) === null || _$appointmentId21$$Sp3 === void 0 ? void 0 : (_$appointmentId21$$Sp4 = _$appointmentId21$$Sp3[0]) === null || _$appointmentId21$$Sp4 === void 0 ? void 0 : _$appointmentId21$$Sp4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail14 = _.practitioner_details) === null || _$practitioner_detail14 === void 0 ? void 0 : (_$practitioner_detail15 = _$practitioner_detail14[0]) === null || _$practitioner_detail15 === void 0 ? void 0 : _$practitioner_detail15.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status3 = _.status) === null || _$status3 === void 0 ? void 0 : _$status3.display) || "",
               action: true
             };
@@ -40653,7 +40717,7 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
         case 5:
           data = _context11.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result11 = data.result) === null || _data$result11 === void 0 ? void 0 : _data$result11.map(function (_) {
-            var _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$appointmentId19, _$appointmentId19$, _$appointmentId19$$Pe, _$appointmentId19$$Pe2, _$visit_type4, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId22, _$appointmentId22$, _$appointmentId23, _$appointmentId23$, _$appointmentId24, _$appointmentId24$, _$status4;
+            var _$patient_id10, _$patient_id10$, _$patient_id10$$name, _$patient_id11, _$patient_id11$, _$appointmentId22, _$appointmentId22$, _$appointmentId22$$Pe, _$appointmentId22$$Pe2, _$patient_id$0$teleco4, _$patient_id12, _$patient_id12$, _$patient_id12$$telec, _$patient_id12$$telec2, _$appointmentId23, _$appointmentId23$, _$appointmentId24, _$appointmentId24$, _$appointmentId25, _$appointmentId25$, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$visit_type4, _$practitioner_detail16, _$practitioner_detail17, _$practitioner_detail18, _$appointmentId28, _$appointmentId28$, _$appointmentId28$$Sp, _$appointmentId28$$Sp2, _$appointmentId28$$Sp3, _$appointmentId28$$Sp4, _$practitioner_detail19, _$practitioner_detail20, _$status4;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
@@ -40691,21 +40755,26 @@ 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_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) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : (_$appointmentId19$$Pe = _$appointmentId19$.PersonID) === null || _$appointmentId19$$Pe === void 0 ? void 0 : (_$appointmentId19$$Pe2 = _$appointmentId19$$Pe[0]) === null || _$appointmentId19$$Pe2 === void 0 ? void 0 : _$appointmentId19$$Pe2.birthDay),
-              visitType: (_$visit_type4 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type4 !== void 0 ? _$visit_type4 : "",
+              name: makeName((_ === 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$$name = _$patient_id10$.name) === null || _$patient_id10$$name === void 0 ? void 0 : _$patient_id10$$name[0]) || {}),
+              mrn: (_ === 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$.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: (_$patient_id$0$teleco4 = _ === 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$$telec = _$patient_id12$.telecom) === null || _$patient_id12$$telec === void 0 ? void 0 : (_$patient_id12$$telec2 = _$patient_id12$$telec[0]) === null || _$patient_id12$$telec2 === void 0 ? void 0 : _$patient_id12$$telec2.value) !== null && _$patient_id$0$teleco4 !== void 0 ? _$patient_id$0$teleco4 : "",
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ? JSON.stringify(_?.patient_id?.[0]?.telecom?.[0]?.value) : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : _$appointmentId21$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId22 = _.appointmentId) === null || _$appointmentId22 === void 0 ? void 0 : (_$appointmentId22$ = _$appointmentId22[0]) === null || _$appointmentId22$ === void 0 ? void 0 : _$appointmentId22$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : _$appointmentId23$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : _$appointmentId24$.appno) || "",
-              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : _$appointmentId23$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : _$appointmentId24$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : _$appointmentId25$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.start, "hh:mm A") : ""),
+              visitType: (_$visit_type4 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type4 !== void 0 ? _$visit_type4 : "",
+              // appointmentStatus: _?.status?.display || "",
               // speciality: JSON.stringify({
               //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
               //     return spl?.coding?.[0]?.display;
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              practitionerName: (_$practitioner_detail16 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail17 = _.practitioner_details) === null || _$practitioner_detail17 === void 0 ? void 0 : (_$practitioner_detail18 = _$practitioner_detail17[0]) === null || _$practitioner_detail18 === void 0 ? void 0 : _$practitioner_detail18.id_name) !== null && _$practitioner_detail16 !== void 0 ? _$practitioner_detail16 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : (_$appointmentId28$$Sp = _$appointmentId28$.SpecialtyID) === null || _$appointmentId28$$Sp === void 0 ? void 0 : (_$appointmentId28$$Sp2 = _$appointmentId28$$Sp[0]) === null || _$appointmentId28$$Sp2 === void 0 ? void 0 : (_$appointmentId28$$Sp3 = _$appointmentId28$$Sp2.coding) === null || _$appointmentId28$$Sp3 === void 0 ? void 0 : (_$appointmentId28$$Sp4 = _$appointmentId28$$Sp3[0]) === null || _$appointmentId28$$Sp4 === void 0 ? void 0 : _$appointmentId28$$Sp4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail19 = _.practitioner_details) === null || _$practitioner_detail19 === void 0 ? void 0 : (_$practitioner_detail20 = _$practitioner_detail19[0]) === null || _$practitioner_detail20 === void 0 ? void 0 : _$practitioner_detail20.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display) || "",
               action: true
             };
           }) : [];
@@ -40751,7 +40820,7 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
         case 5:
           data = _context12.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result12 = data.result) === null || _data$result12 === void 0 ? void 0 : _data$result12.map(function (_) {
-            var _$patient_id9, _$patient_id9$, _$patient_id9$$name, _$patient_id10, _$patient_id10$, _$appointmentId25, _$appointmentId25$, _$appointmentId25$$Pe, _$appointmentId25$$Pe2, _$visit_type5, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId30, _$appointmentId30$, _$status5;
+            var _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$appointmentId29, _$appointmentId29$, _$appointmentId29$$Pe, _$appointmentId29$$Pe2, _$patient_id$0$teleco5, _$patient_id15, _$patient_id15$, _$patient_id15$$telec, _$patient_id15$$telec2, _$appointmentId30, _$appointmentId30$, _$appointmentId31, _$appointmentId31$, _$appointmentId32, _$appointmentId32$, _$appointmentId33, _$appointmentId33$, _$appointmentId34, _$appointmentId34$, _$visit_type5, _$practitioner_detail21, _$practitioner_detail22, _$practitioner_detail23, _$appointmentId35, _$appointmentId35$, _$appointmentId35$$Sp, _$appointmentId35$$Sp2, _$appointmentId35$$Sp3, _$appointmentId35$$Sp4, _$practitioner_detail24, _$practitioner_detail25, _$status5;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40792,12 +40861,13 @@ 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_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : (_$patient_id9$$name = _$patient_id9$.name) === null || _$patient_id9$$name === void 0 ? void 0 : _$patient_id9$$name[0]) || {}),
-              mrn: (_ === 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$.alias) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : (_$appointmentId25$$Pe = _$appointmentId25$.PersonID) === null || _$appointmentId25$$Pe === void 0 ? void 0 : (_$appointmentId25$$Pe2 = _$appointmentId25$$Pe[0]) === null || _$appointmentId25$$Pe2 === void 0 ? void 0 : _$appointmentId25$$Pe2.birthDay),
-              visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : _$appointmentId29$.start, "hh:mm A") : ""),
+              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]) || {}),
+              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$.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: (_$patient_id$0$teleco5 = _ === 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$$telec = _$patient_id15$.telecom) === null || _$patient_id15$$telec === void 0 ? void 0 : (_$patient_id15$$telec2 = _$patient_id15$$telec[0]) === null || _$patient_id15$$telec2 === void 0 ? void 0 : _$patient_id15$$telec2.value) !== null && _$patient_id$0$teleco5 !== void 0 ? _$patient_id$0$teleco5 : "",
               refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : _$appointmentId30$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : _$appointmentId31$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : _$appointmentId32$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : _$appointmentId33$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.start, "hh:mm A") : ""),
+              visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "",
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -40812,6 +40882,9 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              practitionerName: (_$practitioner_detail21 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail22 = _.practitioner_details) === null || _$practitioner_detail22 === void 0 ? void 0 : (_$practitioner_detail23 = _$practitioner_detail22[0]) === null || _$practitioner_detail23 === void 0 ? void 0 : _$practitioner_detail23.id_name) !== null && _$practitioner_detail21 !== void 0 ? _$practitioner_detail21 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : (_$appointmentId35$$Sp = _$appointmentId35$.SpecialtyID) === null || _$appointmentId35$$Sp === void 0 ? void 0 : (_$appointmentId35$$Sp2 = _$appointmentId35$$Sp[0]) === null || _$appointmentId35$$Sp2 === void 0 ? void 0 : (_$appointmentId35$$Sp3 = _$appointmentId35$$Sp2.coding) === null || _$appointmentId35$$Sp3 === void 0 ? void 0 : (_$appointmentId35$$Sp4 = _$appointmentId35$$Sp3[0]) === null || _$appointmentId35$$Sp4 === void 0 ? void 0 : _$appointmentId35$$Sp4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail24 = _.practitioner_details) === null || _$practitioner_detail24 === void 0 ? void 0 : (_$practitioner_detail25 = _$practitioner_detail24[0]) === null || _$practitioner_detail25 === void 0 ? void 0 : _$practitioner_detail25.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status5 = _.status) === null || _$status5 === void 0 ? void 0 : _$status5.display) || "",
               action: true
             };
@@ -40858,8 +40931,9 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
 
         case 5:
           data = _context13.sent;
+          debugger;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result13 = data.result) === null || _data$result13 === void 0 ? void 0 : _data$result13.map(function (_) {
-            var _$Appointment60, _$Appointment60$Perso, _$Appointment60$Perso2, _$Appointment60$Perso3, _$Appointment61, _$Appointment61$Perso, _$Appointment61$Perso2, _$Appointment61$Perso3, _$Appointment62, _$Appointment62$Perso, _$Appointment62$Perso2, _$Appointment$appoint3, _$Appointment63, _$Appointment64, _$Appointment65, _$Appointment66, _$Appointment67, _$Appointment68, _$Appointment69;
+            var _$Appointment62, _$Appointment62$Perso, _$Appointment62$Perso2, _$Appointment62$Perso3, _$Appointment63, _$Appointment63$Perso, _$Appointment63$Perso2, _$Appointment63$Perso3, _$Appointment64, _$Appointment64$Perso, _$Appointment64$Perso2, _$Appointment$PersonI9, _$Appointment65, _$Appointment65$Perso, _$Appointment65$Perso2, _$Appointment65$Perso3, _$Appointment65$Perso4, _$Appointment66, _$Appointment67, _$Appointment68, _$Appointment69, _$Appointment70, _$Encounter$0$visit_t2, _$Encounter37, _$Encounter37$, _$Appointment71, _$Appointment71$resou, _$Appointment72, _$Appointment72$Speci, _$Appointment72$Speci2, _$Appointment72$Speci3, _$Appointment72$Speci4, _$Appointment73, _$Appointment73$orgid, _$Appointment74;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40874,12 +40948,14 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
               //   // genderData: "M",
               //   contact: _.Appointment?.PersonID?.[0]?.telecom?.[0]?.value ?? ""
               // }),
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment60 = _.Appointment) === null || _$Appointment60 === void 0 ? void 0 : (_$Appointment60$Perso = _$Appointment60.PersonID) === null || _$Appointment60$Perso === void 0 ? void 0 : (_$Appointment60$Perso2 = _$Appointment60$Perso[0]) === null || _$Appointment60$Perso2 === void 0 ? void 0 : (_$Appointment60$Perso3 = _$Appointment60$Perso2.name) === null || _$Appointment60$Perso3 === void 0 ? void 0 : _$Appointment60$Perso3[0]) || {}),
-              mrn: ((_$Appointment61 = _.Appointment) === null || _$Appointment61 === void 0 ? void 0 : (_$Appointment61$Perso = _$Appointment61.PersonID) === null || _$Appointment61$Perso === void 0 ? void 0 : (_$Appointment61$Perso2 = _$Appointment61$Perso[0]) === null || _$Appointment61$Perso2 === void 0 ? void 0 : (_$Appointment61$Perso3 = _$Appointment61$Perso2.MRN) === null || _$Appointment61$Perso3 === void 0 ? void 0 : _$Appointment61$Perso3[0]) || "",
-              age: getAge(_ === 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$Perso2.birthDay),
-              visitType: (_$Appointment$appoint3 = _ === null || _ === void 0 ? void 0 : (_$Appointment63 = _.Appointment) === null || _$Appointment63 === void 0 ? void 0 : _$Appointment63.appointmentType) !== null && _$Appointment$appoint3 !== void 0 ? _$Appointment$appoint3 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment64 = _.Appointment) === null || _$Appointment64 === void 0 ? void 0 : _$Appointment64.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment65 = _.Appointment) === null || _$Appointment65 === void 0 ? void 0 : _$Appointment65.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment66 = _.Appointment) === null || _$Appointment66 === void 0 ? void 0 : _$Appointment66.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment67 = _.Appointment) === null || _$Appointment67 === void 0 ? void 0 : _$Appointment67.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment68 = _.Appointment) === null || _$Appointment68 === void 0 ? void 0 : _$Appointment68.appno) || "",
+              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]) || {}),
+              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: (_$Appointment$PersonI9 = _ === 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) !== null && _$Appointment$PersonI9 !== void 0 ? _$Appointment$PersonI9 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment66 = _.Appointment) === null || _$Appointment66 === void 0 ? void 0 : _$Appointment66.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment67 = _.Appointment) === null || _$Appointment67 === void 0 ? void 0 : _$Appointment67.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment68 = _.Appointment) === null || _$Appointment68 === void 0 ? void 0 : _$Appointment68.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment69 = _.Appointment) === null || _$Appointment69 === void 0 ? void 0 : _$Appointment69.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment70 = _.Appointment) === null || _$Appointment70 === void 0 ? void 0 : _$Appointment70.start, "hh:mm A") : ""),
+              //encounterNo : _?.Encounter?.[0]?.encounter_no ?? "",
+              visitType: (_$Encounter$0$visit_t2 = _ === null || _ === void 0 ? void 0 : (_$Encounter37 = _.Encounter) === null || _$Encounter37 === void 0 ? void 0 : (_$Encounter37$ = _$Encounter37[0]) === null || _$Encounter37$ === void 0 ? void 0 : _$Encounter37$.visit_type) !== null && _$Encounter$0$visit_t2 !== void 0 ? _$Encounter$0$visit_t2 : "",
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
               // date: JSON.stringify({
@@ -40897,38 +40973,40 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
               //   }).join(", ") ?? "",
               //   clinic: _?.Appointment?.orgid?.name ?? ""
               // }),
-              // clinic: _?.practitioner_details?.[0]?.clinic || "",
-              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment69 = _.Appointment) === null || _$Appointment69 === void 0 ? void 0 : _$Appointment69.appstatus) || "",
+              practitionerName: makeName(_ === null || _ === void 0 ? void 0 : (_$Appointment71 = _.Appointment) === null || _$Appointment71 === void 0 ? void 0 : (_$Appointment71$resou = _$Appointment71.resourcecode) === null || _$Appointment71$resou === void 0 ? void 0 : _$Appointment71$resou.name),
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$Appointment72 = _.Appointment) === null || _$Appointment72 === void 0 ? void 0 : (_$Appointment72$Speci = _$Appointment72.SpecialtyID) === null || _$Appointment72$Speci === void 0 ? void 0 : (_$Appointment72$Speci2 = _$Appointment72$Speci[0]) === null || _$Appointment72$Speci2 === void 0 ? void 0 : (_$Appointment72$Speci3 = _$Appointment72$Speci2.coding) === null || _$Appointment72$Speci3 === void 0 ? void 0 : (_$Appointment72$Speci4 = _$Appointment72$Speci3[0]) === null || _$Appointment72$Speci4 === void 0 ? void 0 : _$Appointment72$Speci4.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$Appointment73 = _.Appointment) === null || _$Appointment73 === void 0 ? void 0 : (_$Appointment73$orgid = _$Appointment73.orgid) === null || _$Appointment73$orgid === void 0 ? void 0 : _$Appointment73$orgid.name) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment74 = _.Appointment) === null || _$Appointment74 === void 0 ? void 0 : _$Appointment74.appstatus) || "",
               // "View Patient": true,
               // Attend: true,
-              action: true // type: "OP",
+              // type: "OP",
               // appNo: _?.id ?? '',
               // // data: _,
               // enId: _.id,
               // age: getAge(_?.PersonID?.[0]?.birthDay),
               // // gender: _?.PersonID?.[0]?.gender,
-              // contact: _?.PersonID?.[0]?.telecom?.[0]?.value ?? "",
-              // pId : _?.patient_id?.id,
+              action: true // pId : _?.patient_id?.id,
 
             };
           }) : [];
+          debugger;
           return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
           }));
 
-        case 10:
-          _context13.prev = 10;
+        case 12:
+          _context13.prev = 12;
           _context13.t0 = _context13["catch"](2);
           return _context13.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context13.t0.message
           })));
 
-        case 13:
+        case 15:
         case "end":
           return _context13.stop();
       }
     }
-  }, _callee13, null, [[2, 10]]);
+  }, _callee13, null, [[2, 12]]);
 })));
 var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirstVisitsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
@@ -40954,7 +41032,7 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
         case 5:
           data = _context14.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result14 = data.result) === null || _data$result14 === void 0 ? void 0 : _data$result14.map(function (_) {
-            var _$patient_id11, _$patient_id11$, _$patient_id11$$name, _$patient_id12, _$patient_id12$, _$appointmentId31, _$appointmentId31$, _$appointmentId31$$Pe, _$appointmentId31$$Pe2, _$visit_type6, _$appointmentId32, _$appointmentId32$, _$appointmentId33, _$appointmentId33$, _$appointmentId34, _$appointmentId34$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$status6;
+            var _$patient_id16, _$patient_id16$, _$patient_id16$$name, _$patient_id17, _$patient_id17$, _$appointmentId36, _$appointmentId36$, _$appointmentId36$$Pe, _$appointmentId36$$Pe2, _$patient_id$0$teleco6, _$patient_id18, _$patient_id18$, _$patient_id18$$telec, _$patient_id18$$telec2, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId40, _$appointmentId40$, _$appointmentId41, _$appointmentId41$, _$visit_type6, _$practitioner_detail26, _$practitioner_detail27, _$practitioner_detail28, _$practitioner_detail29, _$practitioner_detail30, _$practitioner_detail31, _$practitioner_detail32, _$practitioner_detail33, _$practitioner_detail34, _$practitioner_detail35, _$status6;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -40994,12 +41072,12 @@ 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_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 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : (_$appointmentId31$$Pe = _$appointmentId31$.PersonID) === null || _$appointmentId31$$Pe === void 0 ? void 0 : (_$appointmentId31$$Pe2 = _$appointmentId31$$Pe[0]) === null || _$appointmentId31$$Pe2 === void 0 ? void 0 : _$appointmentId31$$Pe2.birthDay),
-              visitType: (_$visit_type6 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type6 !== void 0 ? _$visit_type6 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : _$appointmentId32$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : _$appointmentId33$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : _$appointmentId35$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.appno) || "",
+              name: makeName((_ === 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$$name = _$patient_id16$.name) === null || _$patient_id16$$name === void 0 ? void 0 : _$patient_id16$$name[0]) || {}),
+              mrn: (_ === 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$.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: (_$patient_id$0$teleco6 = _ === 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) !== null && _$patient_id$0$teleco6 !== void 0 ? _$patient_id$0$teleco6 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : _$appointmentId37$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : _$appointmentId39$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : _$appointmentId41$.start, "hh:mm A") : ""),
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -41014,6 +41092,11 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              //encounterNo : _?.Appointment?.appointmentType ?? "en no",
+              visitType: (_$visit_type6 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type6 !== void 0 ? _$visit_type6 : "",
+              practitionerName: (_$practitioner_detail26 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail27 = _.practitioner_details) === null || _$practitioner_detail27 === void 0 ? void 0 : (_$practitioner_detail28 = _$practitioner_detail27[0]) === null || _$practitioner_detail28 === void 0 ? void 0 : _$practitioner_detail28.id_name) !== null && _$practitioner_detail26 !== void 0 ? _$practitioner_detail26 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail29 = _.practitioner_details) === null || _$practitioner_detail29 === void 0 ? void 0 : (_$practitioner_detail30 = _$practitioner_detail29[0]) === null || _$practitioner_detail30 === void 0 ? void 0 : (_$practitioner_detail31 = _$practitioner_detail30.speciality) === null || _$practitioner_detail31 === void 0 ? void 0 : (_$practitioner_detail32 = _$practitioner_detail31[0]) === null || _$practitioner_detail32 === void 0 ? void 0 : (_$practitioner_detail33 = _$practitioner_detail32[0]) === null || _$practitioner_detail33 === void 0 ? void 0 : _$practitioner_detail33.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail34 = _.practitioner_details) === null || _$practitioner_detail34 === void 0 ? void 0 : (_$practitioner_detail35 = _$practitioner_detail34[0]) === null || _$practitioner_detail35 === void 0 ? void 0 : _$practitioner_detail35.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status6 = _.status) === null || _$status6 === void 0 ? void 0 : _$status6.display) || "",
               action: true
             };
@@ -41060,7 +41143,7 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
         case 5:
           data = _context15.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result15 = data.result) === null || _data$result15 === void 0 ? void 0 : _data$result15.map(function (_) {
-            var _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$appointmentId37, _$appointmentId37$, _$appointmentId37$$Pe, _$appointmentId37$$Pe2, _$visit_type7, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId40, _$appointmentId40$, _$appointmentId41, _$appointmentId41$, _$appointmentId42, _$appointmentId42$, _$status7;
+            var _$patient_id19, _$patient_id19$, _$patient_id19$$name, _$patient_id20, _$patient_id20$, _$appointmentId42, _$appointmentId42$, _$appointmentId42$$Pe, _$appointmentId42$$Pe2, _$patient_id$0$teleco7, _$patient_id21, _$patient_id21$, _$patient_id21$$telec, _$patient_id21$$telec2, _$appointmentId43, _$appointmentId43$, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$appointmentId47, _$appointmentId47$, _$visit_type7, _$practitioner_detail36, _$practitioner_detail37, _$practitioner_detail38, _$practitioner_detail39, _$practitioner_detail40, _$practitioner_detail41, _$practitioner_detail42, _$practitioner_detail43, _$practitioner_detail44, _$practitioner_detail45, _$status7;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -41100,12 +41183,12 @@ 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_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) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : (_$appointmentId37$$Pe = _$appointmentId37$.PersonID) === null || _$appointmentId37$$Pe === void 0 ? void 0 : (_$appointmentId37$$Pe2 = _$appointmentId37$$Pe[0]) === null || _$appointmentId37$$Pe2 === void 0 ? void 0 : _$appointmentId37$$Pe2.birthDay),
-              visitType: (_$visit_type7 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type7 !== void 0 ? _$visit_type7 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : _$appointmentId39$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : _$appointmentId41$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.appno) || "",
+              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]) || {}),
+              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 : (_$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: (_$patient_id$0$teleco7 = _ === 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) !== null && _$patient_id$0$teleco7 !== void 0 ? _$patient_id$0$teleco7 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId43 = _.appointmentId) === null || _$appointmentId43 === void 0 ? void 0 : (_$appointmentId43$ = _$appointmentId43[0]) === null || _$appointmentId43$ === void 0 ? void 0 : _$appointmentId43$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : _$appointmentId47$.start, "hh:mm A") : ""),
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -41120,6 +41203,10 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              visitType: (_$visit_type7 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type7 !== void 0 ? _$visit_type7 : "",
+              practitionerName: (_$practitioner_detail36 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail37 = _.practitioner_details) === null || _$practitioner_detail37 === void 0 ? void 0 : (_$practitioner_detail38 = _$practitioner_detail37[0]) === null || _$practitioner_detail38 === void 0 ? void 0 : _$practitioner_detail38.id_name) !== null && _$practitioner_detail36 !== void 0 ? _$practitioner_detail36 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail39 = _.practitioner_details) === null || _$practitioner_detail39 === void 0 ? void 0 : (_$practitioner_detail40 = _$practitioner_detail39[0]) === null || _$practitioner_detail40 === void 0 ? void 0 : (_$practitioner_detail41 = _$practitioner_detail40.speciality) === null || _$practitioner_detail41 === void 0 ? void 0 : (_$practitioner_detail42 = _$practitioner_detail41[0]) === null || _$practitioner_detail42 === void 0 ? void 0 : (_$practitioner_detail43 = _$practitioner_detail42[0]) === null || _$practitioner_detail43 === void 0 ? void 0 : _$practitioner_detail43.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail44 = _.practitioner_details) === null || _$practitioner_detail44 === void 0 ? void 0 : (_$practitioner_detail45 = _$practitioner_detail44[0]) === null || _$practitioner_detail45 === void 0 ? void 0 : _$practitioner_detail45.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status7 = _.status) === null || _$status7 === void 0 ? void 0 : _$status7.display) || "",
               action: true
             };
@@ -41166,7 +41253,7 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
         case 5:
           data = _context16.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result16 = data.result) === null || _data$result16 === void 0 ? void 0 : _data$result16.map(function (_) {
-            var _$patient_id15, _$patient_id15$, _$patient_id15$$name, _$patient_id16, _$patient_id16$, _$appointmentId43, _$appointmentId43$, _$appointmentId43$$Pe, _$appointmentId43$$Pe2, _$visit_type8, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$appointmentId47, _$appointmentId47$, _$appointmentId48, _$appointmentId48$, _$status8;
+            var _$patient_id22, _$patient_id22$, _$patient_id22$$name, _$patient_id23, _$patient_id23$, _$appointmentId48, _$appointmentId48$, _$appointmentId48$$Pe, _$appointmentId48$$Pe2, _$patient_id$0$teleco8, _$patient_id24, _$patient_id24$, _$patient_id24$$telec, _$patient_id24$$telec2, _$appointmentId49, _$appointmentId49$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$visit_type8, _$practitioner_detail46, _$practitioner_detail47, _$practitioner_detail48, _$practitioner_detail49, _$practitioner_detail50, _$practitioner_detail51, _$practitioner_detail52, _$practitioner_detail53, _$practitioner_detail54, _$practitioner_detail55, _$status8;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -41206,12 +41293,12 @@ 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_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$.MRN) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId43 = _.appointmentId) === null || _$appointmentId43 === void 0 ? void 0 : (_$appointmentId43$ = _$appointmentId43[0]) === null || _$appointmentId43$ === void 0 ? void 0 : (_$appointmentId43$$Pe = _$appointmentId43$.PersonID) === null || _$appointmentId43$$Pe === void 0 ? void 0 : (_$appointmentId43$$Pe2 = _$appointmentId43$$Pe[0]) === null || _$appointmentId43$$Pe2 === void 0 ? void 0 : _$appointmentId43$$Pe2.birthDay),
-              visitType: (_$visit_type8 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type8 !== void 0 ? _$visit_type8 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : _$appointmentId47$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : _$appointmentId48$.appno) || "",
+              name: makeName((_ === 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$$name = _$patient_id22$.name) === null || _$patient_id22$$name === void 0 ? void 0 : _$patient_id22$$name[0]) || {}),
+              mrn: (_ === 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$.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: (_$patient_id$0$teleco8 = _ === 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$$telec = _$patient_id24$.telecom) === null || _$patient_id24$$telec === void 0 ? void 0 : (_$patient_id24$$telec2 = _$patient_id24$$telec[0]) === null || _$patient_id24$$telec2 === void 0 ? void 0 : _$patient_id24$$telec2.value) !== null && _$patient_id$0$teleco8 !== void 0 ? _$patient_id$0$teleco8 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : _$appointmentId49$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : _$appointmentId51$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : _$appointmentId53$.start, "hh:mm A") : ""),
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -41226,6 +41313,10 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              visitType: (_$visit_type8 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type8 !== void 0 ? _$visit_type8 : "",
+              practitionerName: (_$practitioner_detail46 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail47 = _.practitioner_details) === null || _$practitioner_detail47 === void 0 ? void 0 : (_$practitioner_detail48 = _$practitioner_detail47[0]) === null || _$practitioner_detail48 === void 0 ? void 0 : _$practitioner_detail48.id_name) !== null && _$practitioner_detail46 !== void 0 ? _$practitioner_detail46 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail49 = _.practitioner_details) === null || _$practitioner_detail49 === void 0 ? void 0 : (_$practitioner_detail50 = _$practitioner_detail49[0]) === null || _$practitioner_detail50 === void 0 ? void 0 : (_$practitioner_detail51 = _$practitioner_detail50.speciality) === null || _$practitioner_detail51 === void 0 ? void 0 : (_$practitioner_detail52 = _$practitioner_detail51[0]) === null || _$practitioner_detail52 === void 0 ? void 0 : (_$practitioner_detail53 = _$practitioner_detail52[0]) === null || _$practitioner_detail53 === void 0 ? void 0 : _$practitioner_detail53.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail54 = _.practitioner_details) === null || _$practitioner_detail54 === void 0 ? void 0 : (_$practitioner_detail55 = _$practitioner_detail54[0]) === null || _$practitioner_detail55 === void 0 ? void 0 : _$practitioner_detail55.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status8 = _.status) === null || _$status8 === void 0 ? void 0 : _$status8.display) || "",
               action: true
             };
@@ -41272,7 +41363,7 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
         case 5:
           data = _context17.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result17 = data.result) === null || _data$result17 === void 0 ? void 0 : _data$result17.map(function (_) {
-            var _$patient_id17, _$patient_id17$, _$patient_id17$$name, _$patient_id18, _$patient_id18$, _$appointmentId49, _$appointmentId49$, _$appointmentId49$$Pe, _$appointmentId49$$Pe2, _$visit_type9, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId54, _$appointmentId54$, _$status9;
+            var _$patient_id25, _$patient_id25$, _$patient_id25$$name, _$patient_id26, _$patient_id26$, _$appointmentId54, _$appointmentId54$, _$appointmentId54$$Pe, _$appointmentId54$$Pe2, _$patient_id$0$teleco9, _$patient_id27, _$patient_id27$, _$patient_id27$$telec, _$patient_id27$$telec2, _$appointmentId55, _$appointmentId55$, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$visit_type9, _$practitioner_detail56, _$practitioner_detail57, _$practitioner_detail58, _$practitioner_detail59, _$practitioner_detail60, _$practitioner_detail61, _$practitioner_detail62, _$practitioner_detail63, _$practitioner_detail64, _$practitioner_detail65, _$status9;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -41312,12 +41403,12 @@ 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_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : (_$patient_id17$$name = _$patient_id17$.name) === null || _$patient_id17$$name === void 0 ? void 0 : _$patient_id17$$name[0]) || {}),
-              mrn: (_ === 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$.MRN) || "",
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : (_$appointmentId49$$Pe = _$appointmentId49$.PersonID) === null || _$appointmentId49$$Pe === void 0 ? void 0 : (_$appointmentId49$$Pe2 = _$appointmentId49$$Pe[0]) === null || _$appointmentId49$$Pe2 === void 0 ? void 0 : _$appointmentId49$$Pe2.birthDay),
-              visitType: (_$visit_type9 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type9 !== void 0 ? _$visit_type9 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : _$appointmentId51$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : _$appointmentId53$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId54 = _.appointmentId) === null || _$appointmentId54 === void 0 ? void 0 : (_$appointmentId54$ = _$appointmentId54[0]) === null || _$appointmentId54$ === void 0 ? void 0 : _$appointmentId54$.appno) || "",
+              name: makeName((_ === 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$$name = _$patient_id25$.name) === null || _$patient_id25$$name === void 0 ? void 0 : _$patient_id25$$name[0]) || {}),
+              mrn: (_ === 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$.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: (_$patient_id$0$teleco9 = _ === 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$$telec = _$patient_id27$.telecom) === null || _$patient_id27$$telec === void 0 ? void 0 : (_$patient_id27$$telec2 = _$patient_id27$$telec[0]) === null || _$patient_id27$$telec2 === void 0 ? void 0 : _$patient_id27$$telec2.value) !== null && _$patient_id$0$teleco9 !== void 0 ? _$patient_id$0$teleco9 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : _$appointmentId55$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start, "hh:mm A") : ""),
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -41332,6 +41423,10 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              visitType: (_$visit_type9 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type9 !== void 0 ? _$visit_type9 : "",
+              practitionerName: (_$practitioner_detail56 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail57 = _.practitioner_details) === null || _$practitioner_detail57 === void 0 ? void 0 : (_$practitioner_detail58 = _$practitioner_detail57[0]) === null || _$practitioner_detail58 === void 0 ? void 0 : _$practitioner_detail58.id_name) !== null && _$practitioner_detail56 !== void 0 ? _$practitioner_detail56 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail59 = _.practitioner_details) === null || _$practitioner_detail59 === void 0 ? void 0 : (_$practitioner_detail60 = _$practitioner_detail59[0]) === null || _$practitioner_detail60 === void 0 ? void 0 : (_$practitioner_detail61 = _$practitioner_detail60.speciality) === null || _$practitioner_detail61 === void 0 ? void 0 : (_$practitioner_detail62 = _$practitioner_detail61[0]) === null || _$practitioner_detail62 === void 0 ? void 0 : (_$practitioner_detail63 = _$practitioner_detail62[0]) === null || _$practitioner_detail63 === void 0 ? void 0 : _$practitioner_detail63.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail64 = _.practitioner_details) === null || _$practitioner_detail64 === void 0 ? void 0 : (_$practitioner_detail65 = _$practitioner_detail64[0]) === null || _$practitioner_detail65 === void 0 ? void 0 : _$practitioner_detail65.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status9 = _.status) === null || _$status9 === void 0 ? void 0 : _$status9.display) || "",
               action: true
             };
@@ -41378,7 +41473,7 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
         case 5:
           data = _context18.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result18 = data.result) === null || _data$result18 === void 0 ? void 0 : _data$result18.map(function (_) {
-            var _$patient_id19, _$patient_id19$, _$patient_id19$$name, _$patient_id20, _$patient_id20$, _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Pe, _$appointmentId55$$Pe2, _$visit_type10, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$status10;
+            var _$patient_id28, _$patient_id28$, _$patient_id28$$name, _$patient_id29, _$patient_id29$, _$appointmentId60, _$appointmentId60$, _$appointmentId60$$Pe, _$appointmentId60$$Pe2, _$patient_id$0$teleco10, _$patient_id30, _$patient_id30$, _$patient_id30$$telec, _$patient_id30$$telec2, _$appointmentId61, _$appointmentId61$, _$appointmentId62, _$appointmentId62$, _$appointmentId63, _$appointmentId63$, _$appointmentId64, _$appointmentId64$, _$appointmentId65, _$appointmentId65$, _$visit_type10, _$practitioner_detail66, _$practitioner_detail67, _$practitioner_detail68, _$practitioner_detail69, _$practitioner_detail70, _$practitioner_detail71, _$practitioner_detail72, _$practitioner_detail73, _$practitioner_detail74, _$practitioner_detail75, _$status10;
 
             return {
               // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -41418,12 +41513,12 @@ 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_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 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : (_$appointmentId55$$Pe = _$appointmentId55$.PersonID) === null || _$appointmentId55$$Pe === void 0 ? void 0 : (_$appointmentId55$$Pe2 = _$appointmentId55$$Pe[0]) === null || _$appointmentId55$$Pe2 === void 0 ? void 0 : _$appointmentId55$$Pe2.birthDay),
-              visitType: (_$visit_type10 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type10 !== void 0 ? _$visit_type10 : "",
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start, "hh:mm A") : ""),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.appno) || "",
+              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]) || {}),
+              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: 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: (_$patient_id$0$teleco10 = _ === 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) !== null && _$patient_id$0$teleco10 !== void 0 ? _$patient_id$0$teleco10 : "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : _$appointmentId61$.appno) || "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : _$appointmentId62$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : _$appointmentId63$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId64 = _.appointmentId) === null || _$appointmentId64 === void 0 ? void 0 : (_$appointmentId64$ = _$appointmentId64[0]) === null || _$appointmentId64$ === void 0 ? void 0 : _$appointmentId64$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : _$appointmentId65$.start, "hh:mm A") : ""),
               // date: JSON.stringify({
               //   date: _?.appointmentId?.[0]?.start
               //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
@@ -41438,6 +41533,10 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
               //   }).join(", "),
               //   clinic: _?.practitioner_details?.[0]?.clinic || ""
               // }),
+              visitType: (_$visit_type10 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type10 !== void 0 ? _$visit_type10 : "",
+              practitionerName: (_$practitioner_detail66 = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail67 = _.practitioner_details) === null || _$practitioner_detail67 === void 0 ? void 0 : (_$practitioner_detail68 = _$practitioner_detail67[0]) === null || _$practitioner_detail68 === void 0 ? void 0 : _$practitioner_detail68.id_name) !== null && _$practitioner_detail66 !== void 0 ? _$practitioner_detail66 : "",
+              speciality: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail69 = _.practitioner_details) === null || _$practitioner_detail69 === void 0 ? void 0 : (_$practitioner_detail70 = _$practitioner_detail69[0]) === null || _$practitioner_detail70 === void 0 ? void 0 : (_$practitioner_detail71 = _$practitioner_detail70.speciality) === null || _$practitioner_detail71 === void 0 ? void 0 : (_$practitioner_detail72 = _$practitioner_detail71[0]) === null || _$practitioner_detail72 === void 0 ? void 0 : (_$practitioner_detail73 = _$practitioner_detail72[0]) === null || _$practitioner_detail73 === void 0 ? void 0 : _$practitioner_detail73.display) || "",
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail74 = _.practitioner_details) === null || _$practitioner_detail74 === void 0 ? void 0 : (_$practitioner_detail75 = _$practitioner_detail74[0]) === null || _$practitioner_detail75 === void 0 ? void 0 : _$practitioner_detail75.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status10 = _.status) === null || _$status10 === void 0 ? void 0 : _$status10.display) || "",
               action: true
             };
@@ -42854,7 +42953,7 @@ var orderSetDropDown = {
     return {
       db_name: dbName,
       entity: "CA_OrderSet,CA_OrderSet_Applicability",
-      filter: "CA_OrderSet._id == CA_OrderSet_Applicability.Ordersetcode && (CA_OrderSet_Applicability.specialty=='".concat(list.speciality, "' || CA_OrderSet_Applicability.locationCode=='").concat(list.location, "' || CA_OrderSet_Applicability.practRoleId=='").concat(list.pract, "' || CA_OrderSet_Applicability.diagnosisCode=='").concat(list.diag, "')"),
+      filter: "CA_OrderSet._id == CA_OrderSet_Applicability.Ordersetcode && (CA_OrderSet_Applicability.specialty=='".concat(list.speciality, "' && CA_OrderSet_Applicability.locationCode=='").concat(list.location, "' && CA_OrderSet_Applicability.practRoleId=='").concat(list.pract, "' && CA_OrderSet_Applicability.diagnosisCode=='").concat(list.diag, "')"),
       return_fields: " distinct merge(CA_OrderSet,{components:(for comp in CA_OrderSet_Components filter comp._id in CA_OrderSet.components return merge(comp,{orderCatalog:merge(document(comp.orderCatalog),{ordertype:document(document(comp.orderCatalog).ordertype)},{ordercategory:document(document(comp.orderCatalog).ordercategory)}),ordercategory:document(comp.ordercategory),ordertype:document(comp.ordertype),IVDosDurUOM:document(comp.IVDosDurUOM),IVInfusRateUOM:document(comp.IVInfusRateUOM),IVInfusRateVolUOM:document(comp.IVInfusRateVolUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltFreqRateUnit:document(comp.dfltFreqRateUnit),dfltFreqValUnit:document(comp.dfltFreqValUnit),dfltOrderUOM:document(comp.dfltOrderUOM),route:document(comp.route)}))})"
     }; // {
     //   db_name: dbName,
@@ -43014,19 +43113,20 @@ 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 : "",
-      UseAsFreqDose: [// {
-        //   frqGrpId: "number",
-        //   dispSeqNo: "number",
-        //   adminDate: "number",
-        //   adminTime: "time",
-        //   adminDosageQty: "number",
-        //   adminDosageUOM: "string",
-        //   adminDosageInstruction: "string",
-        //   adminFrDay: "number",
-        //   adminToDay: "number",
-        //   adminDosageFreqCode: "string",
-        // },
-      ],
+      // UseAsFreqDose: [
+      // {
+      //   frqGrpId: "number",
+      //   dispSeqNo: "number",
+      //   adminDate: "number",
+      //   adminTime: "time",
+      //   adminDosageQty: "number",
+      //   adminDosageUOM: "string",
+      //   adminDosageInstruction: "string",
+      //   adminFrDay: "number",
+      //   adminToDay: "number",
+      //   adminDosageFreqCode: "string",
+      // },
+      // ],
       useAsTaperedDose: [// {
         //   tdGrpId: "number",
         //   dispSeqNo: "number",