primarycare-binder 1.1.31 → 1.1.35

package/dist/index.cjs.js

@@ -9476,13 +9476,14 @@ var makeName = function makeName() {
       _nameObj$text = nameObj.text,
       text = _nameObj$text === void 0 ? "" : _nameObj$text,
       _nameObj$given = nameObj.given,
-      given = _nameObj$given === void 0 ? "" : _nameObj$given;
-      nameObj.family;
-      var _nameObj$suffix = nameObj.suffix,
+      given = _nameObj$given === void 0 ? "" : _nameObj$given,
+      _nameObj$family = nameObj.family,
+      family = _nameObj$family === void 0 ? "" : _nameObj$family,
+      _nameObj$suffix = nameObj.suffix,
       suffix = _nameObj$suffix === void 0 ? "" : _nameObj$suffix;
   var prefixVal = (prefix === null || prefix === void 0 ? void 0 : (_prefix$coding = prefix.coding) === null || _prefix$coding === void 0 ? void 0 : (_prefix$coding$ = _prefix$coding[0]) === null || _prefix$coding$ === void 0 ? void 0 : _prefix$coding$.display) || "";
   var suffixVal = (suffix === null || suffix === void 0 ? void 0 : (_suffix$coding = suffix.coding) === null || _suffix$coding === void 0 ? void 0 : (_suffix$coding$ = _suffix$coding[0]) === null || _suffix$coding$ === void 0 ? void 0 : _suffix$coding$.display) || "";
-  return "".concat(prefixVal && prefixVal + ".").concat(text && text + " ").concat(given && given + " ").concat(suffixVal && suffixVal);
+  return "".concat(prefixVal && prefixVal + ".").concat(text && text + " ").concat(given && given + " ").concat(family && family + " ").concat(suffixVal && suffixVal);
 };
 
 var fetchData$3 = /*#__PURE__*/function () {
@@ -11371,7 +11372,7 @@ var GET__FOLLOW_UP_APPOINTMENT = createAsyncThunk("appointmentReducer/follow_up_
           body = {
             db_name: dbName,
             entity: "AppointmentRequest",
-            filter: "AppointmentRequest.patientid=='".concat(patientId, "' and DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))>=DATE_TIMESTAMP(DATE_NOW())"),
+            filter: "AppointmentRequest.status =='pending' && AppointmentRequest.patientid=='".concat(patientId, "' and DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))>=DATE_TIMESTAMP(DATE_NOW())"),
             return_fields: "merge(AppointmentRequest,{encounterid:(for e in Encounter filter e._id == AppointmentRequest.encounterid return merge(e,{appointmentId:(for app in Appointment filter app.id in e.appointmentId return app.consultationMode)}))},{followupduruom:document(AppointmentRequest.followupduruom)},{followupreason:document(AppointmentRequest.followupreason)},{healthserviceid:to_array(document(AppointmentRequest.healthserviceid))},{orgid:to_array(document(AppointmentRequest.orgid))}, {practitionerid:(for doc in Practitioner filter doc._id == AppointmentRequest.practitionerid return merge(doc,{name:(for name in HumanNameMaster filter name._id in doc.name return merge(name,{use:document(name.use)},{prefix:merge(document(name.prefix),{coding:document(document(name.prefix).coding)})},{suffix:merge(document(name.suffix),{coding:document(document(name.suffix).coding)})}))}, {practitioner_role:(for pr in PractitionerRole filter pr._id in doc.practitioner_role return merge(pr,{role:document(pr.role)}))},{photo:document(doc.photo)}))}, {patientid:(for pat in Patient filter pat._id == AppointmentRequest.patientid return merge (pat,{name:(for name in HumanNameMaster filter name._id in pat.name return merge(name,{use:(document(name.use))},{prefix:(document(name.prefix))},{suffix:document(name.suffix)}))}))},{specialtyid:document(AppointmentRequest.specialtyid)})"
           }; // const body = {
           //   "db_name": dbName,
@@ -13977,6 +13978,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     night: night,
                     slots: slots,
                     resourceInfo: resourceInfo,
+                    bio: "",
                     specialities: [],
                     healthCareId: healthCareId,
                     orgId: isClinic ? id : restData === null || restData === void 0 ? void 0 : (_restData$hospital3 = restData.hospital) === null || _restData$hospital3 === void 0 ? void 0 : _restData$hospital3.id,
@@ -14026,7 +14028,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$locationID4 = restData.locationID) === null || _restData$locationID4 === void 0 ? void 0 : (_restData$locationID5 = _restData$locationID4.photo) === null || _restData$locationID5 === void 0 ? void 0 : (_restData$locationID6 = _restData$locationID5[0]) === null || _restData$locationID6 === void 0 ? void 0 : _restData$locationID6.fileid);
                   } else {
-                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital6, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital7, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$;
+                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital6, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital7, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$, _restData$biography, _restData$biography$;
 
                     var _gender = (restData === null || restData === void 0 ? void 0 : (_restData$gender = restData.gender) === null || _restData$gender === void 0 ? void 0 : (_restData$gender$codi = _restData$gender.coding) === null || _restData$gender$codi === void 0 ? void 0 : (_restData$gender$codi2 = _restData$gender$codi[0]) === null || _restData$gender$codi2 === void 0 ? void 0 : _restData$gender$codi2.display) || "";
 
@@ -14070,7 +14072,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     info["hospId"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : _restData$hospital6.id;
                     info["subtext"] = (restData === null || restData === void 0 ? void 0 : (_restData$qualificati = restData.qualification) === null || _restData$qualificati === void 0 ? void 0 : (_restData$qualificati2 = _restData$qualificati.map) === null || _restData$qualificati2 === void 0 ? void 0 : (_restData$qualificati3 = _restData$qualificati2.call(_restData$qualificati, function (q) {
                       return (q === null || q === void 0 ? void 0 : q.name) || "";
-                    })) === null || _restData$qualificati3 === void 0 ? void 0 : _restData$qualificati3.join(", ")) || "MBBS";
+                    })) === null || _restData$qualificati3 === void 0 ? void 0 : _restData$qualificati3.join(", ")) || "----";
                     info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
                     info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital7 = restData.hospital) === null || _restData$hospital7 === void 0 ? void 0 : _restData$hospital7.name) || "";
                     info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.line) || "";
@@ -14079,6 +14081,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$photo = restData.photo) === null || _restData$photo === void 0 ? void 0 : (_restData$photo$ = _restData$photo[0]) === null || _restData$photo$ === void 0 ? void 0 : _restData$photo$.fileid);
                     info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address6 = restData.address) === null || _restData$address6 === void 0 ? void 0 : (_restData$address6$ = _restData$address6[0]) === null || _restData$address6$ === void 0 ? void 0 : _restData$address6$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
+                    info["bio"] = (restData === null || restData === void 0 ? void 0 : (_restData$biography = restData.biography) === null || _restData$biography === void 0 ? void 0 : (_restData$biography$ = _restData$biography[0]) === null || _restData$biography$ === void 0 ? void 0 : _restData$biography$.biography_description) || "";
                   }
 
                   returnData.push(info);
@@ -16352,11 +16355,11 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
             doc: {
               identifier: [],
               name: [{
-                use: "string",
+                use: "",
                 text: firstName,
                 family: lastName,
-                given: firstName,
-                prefix: gender.toLowerCase() === "male" ? "Mr" : "Mrs",
+                given: "",
+                prefix: "",
                 suffix: "",
                 period: [{
                   start: Math.floor(Date.now() / 1000),
@@ -16619,6 +16622,12 @@ var READ_PERSON = createAsyncThunk("personApiSlice/readPerson", /*#__PURE__*/_as
       _data$9$,
       _data$9$$photo,
       _data$9$$photo$,
+      _data$10,
+      _data$10$,
+      _data$10$$Patientname,
+      _data$10$$Patientname2,
+      _data$10$$Patientname3,
+      _data$10$$Patientname4,
       _payload$phone3,
       phone,
       _payload$allData,
@@ -16662,7 +16671,7 @@ var READ_PERSON = createAsyncThunk("personApiSlice/readPerson", /*#__PURE__*/_as
               return val.system === "Email" && val.use === "Work";
             })) === null || _data$7$$telecom$find === void 0 ? void 0 : _data$7$$telecom$find.value) || "",
             allData: data === null || data === void 0 ? void 0 : (_data$8 = data[0]) === null || _data$8 === void 0 ? void 0 : _data$8[0],
-            imgUrl: (data === null || data === void 0 ? void 0 : (_data$9 = data[0]) === null || _data$9 === void 0 ? void 0 : (_data$9$ = _data$9[0]) === null || _data$9$ === void 0 ? void 0 : (_data$9$$photo = _data$9$.photo) === null || _data$9$$photo === void 0 ? void 0 : (_data$9$$photo$ = _data$9$$photo[0]) === null || _data$9$$photo$ === void 0 ? void 0 : _data$9$$photo$.fileid) || "",
+            imgUrl: (data === null || data === void 0 ? void 0 : (_data$9 = data[0]) === null || _data$9 === void 0 ? void 0 : (_data$9$ = _data$9[0]) === null || _data$9$ === void 0 ? void 0 : (_data$9$$photo = _data$9$.photo) === null || _data$9$$photo === void 0 ? void 0 : (_data$9$$photo$ = _data$9$$photo[0]) === null || _data$9$$photo$ === void 0 ? void 0 : _data$9$$photo$.fileid) || (data === null || data === void 0 ? void 0 : (_data$10 = data[0]) === null || _data$10 === void 0 ? void 0 : (_data$10$ = _data$10[0]) === null || _data$10$ === void 0 ? void 0 : (_data$10$$Patientname = _data$10$.Patientname) === null || _data$10$$Patientname === void 0 ? void 0 : (_data$10$$Patientname2 = _data$10$$Patientname[0]) === null || _data$10$$Patientname2 === void 0 ? void 0 : (_data$10$$Patientname3 = _data$10$$Patientname2.photo) === null || _data$10$$Patientname3 === void 0 ? void 0 : (_data$10$$Patientname4 = _data$10$$Patientname3[0]) === null || _data$10$$Patientname4 === void 0 ? void 0 : _data$10$$Patientname4.fileid) || "",
             data: data
           };
 
@@ -16797,8 +16806,8 @@ var SEARCH_PRACTIONER = createAsyncThunk("personApiSlice/SearchPractioner", /*#_
   var payload,
       _ref13,
       rejectWithValue,
-      _data$10,
-      _data$10$OrgID,
+      _data$11,
+      _data$11$OrgID,
       _payload$email3,
       email,
       body,
@@ -16834,7 +16843,7 @@ var SEARCH_PRACTIONER = createAsyncThunk("personApiSlice/SearchPractioner", /*#_
           body__ = {
             db_name: dbName,
             entity: "Organization",
-            filter: "Organization.id==".concat(data === null || data === void 0 ? void 0 : (_data$10 = data[0]) === null || _data$10 === void 0 ? void 0 : (_data$10$OrgID = _data$10.OrgID) === null || _data$10$OrgID === void 0 ? void 0 : _data$10$OrgID[0]),
+            filter: "Organization.id==".concat(data === null || data === void 0 ? void 0 : (_data$11 = data[0]) === null || _data$11 === void 0 ? void 0 : (_data$11$OrgID = _data$11.OrgID) === null || _data$11$OrgID === void 0 ? void 0 : _data$11$OrgID[0]),
             return_fields: "{_id:Organization._id,OrgID:Organization.id,name:Organization.name}"
           };
           _context6.next = 11;
@@ -16877,7 +16886,7 @@ var GET_RELATED_PERSON = createAsyncThunk("personApiSlice/getRelatedPerson", /*#
       body,
       data,
       returnData,
-      _data$11,
+      _data$12,
       _args7 = arguments;
 
   return regeneratorRuntime.wrap(function _callee7$(_context7) {
@@ -16905,7 +16914,7 @@ var GET_RELATED_PERSON = createAsyncThunk("personApiSlice/getRelatedPerson", /*#
           returnData = [];
 
           if (Array.isArray(data)) {
-            returnData = ((_data$11 = data[0]) === null || _data$11 === void 0 ? void 0 : _data$11.data) || [];
+            returnData = ((_data$12 = data[0]) === null || _data$12 === void 0 ? void 0 : _data$12.data) || [];
           }
 
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -19995,7 +20004,7 @@ var FOLLOW_UP_COUNT = createAsyncThunk("dashboardApiSlice/followUpCount", /*#__P
             body: JSON.stringify({
               db_name: dbName,
               entity: "AppointmentRequest",
-              filter: "DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))>=".concat(startDate, "*1000 && DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))<=").concat(endDate, "*1000 COLLECT WITH COUNT INTO length"),
+              filter: "AppointmentRequest.status == 'pending' && DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))>=".concat(startDate, "*1000 && DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))<=").concat(endDate, "*1000 COLLECT WITH COUNT INTO length"),
               return_fields: "{FollowUpAppointments:length}"
             })
           }, __readDocumentUrl__);
@@ -20029,6 +20038,7 @@ var REFERRAL_COUNT = createAsyncThunk("dashboardApiSlice/referralCount", /*#__PU
       _data$result$0$Appoin,
       _data$result8,
       _data$result8$,
+      startDate,
       data,
       _args16 = arguments;
 
@@ -20039,17 +20049,19 @@ var REFERRAL_COUNT = createAsyncThunk("dashboardApiSlice/referralCount", /*#__PU
           payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
           _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
           _context16.prev = 2;
-          _context16.next = 5;
+          startDate = getUtcTime(moment().startOf("day"));
+          ;
+          _context16.next = 7;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
               entity: "ReferralTrx",
-              filter: "ReferralTrx.activestatus==true && ReferralTrx.recipientBookingReqd==true collect with count into length",
+              filter: "ReferralTrx.activestatus==true && ReferralTrx.recipientBookingReqd==true && ReferralTrx.recipientBookingReqd ==true collect with count into length",
               return_fields: "{AppointmentReferral : length}"
             })
           }, __readDocumentUrl__);
 
-        case 5:
+        case 7:
           data = _context16.sent;
           return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: {
@@ -20057,19 +20069,19 @@ var REFERRAL_COUNT = createAsyncThunk("dashboardApiSlice/referralCount", /*#__PU
             }
           }));
 
-        case 9:
-          _context16.prev = 9;
+        case 11:
+          _context16.prev = 11;
           _context16.t0 = _context16["catch"](2);
           return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context16.t0.message
           })));
 
-        case 12:
+        case 14:
         case "end":
           return _context16.stop();
       }
     }
-  }, _callee16, null, [[2, 9]]);
+  }, _callee16, null, [[2, 11]]);
 }))); //ASSIGN_PRACTITIONER_TYPE
 
 var ASSIGN_PRACTITIONER_TYPE = createAsyncThunk("dashboardApiSlice/assignPractitionerType", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
@@ -20441,8 +20453,9 @@ var ASSIGN_LIST = createAsyncThunk("dashboardApiSlice/assignList", /*#__PURE__*/
 })));
 
 var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
-  var _data$Encounter$visit2, _data$Encounter23, _data$Encounter24, _data$Encounter25, _data$Encounter$reaso2, _data$Encounter26, _data$Encounter26$rea, _data$Appointment7, _data$Appointment8, _data$Appointment$con2, _data$Appointment9, _data$Appointment10, _data$Appointment11, _data$Appointment12, _data$Appointment12$a, _data$Encounter$patie5, _data$Encounter27, _data$Encounter27$pat, _data$Encounter27$pat2, _data$Encounter27$pat3, _ref46, _data$Encounter28, _data$Encounter28$pat, _data$Encounter28$pat2, _data$Encounter28$pat3, _data$Encounter29, _data$Encounter29$pat, _data$Encounter29$pat2, _data$Encounter29$pat3, _data$Encounter$patie6, _data$Encounter30, _data$Encounter30$pat, _data$Encounter30$pat2, _data$Encounter31, _data$Encounter31$pat, _data$Encounter31$pat2, _data$Encounter31$pat3, _data$Encounter32, _data$Encounter32$pat, _data$Encounter32$pat2, _data$Encounter32$pat3, _data$Encounter33, _data$Encounter33$pat, _data$Encounter33$pat2, _data$Encounter33$pat3, _data$Encounter$patie7, _data$Encounter34, _data$Encounter34$pat, _data$Encounter34$pat2, _data$Encounter$patie8, _data$Encounter35, _data$Encounter35$pat, _data$Encounter35$pat2, _data$Encounter35$pat3, _data$Encounter35$pat4, _data$Encounter$pract3, _data$Encounter36, _data$Encounter36$pra, _data$Encounter36$pra2, _data$Encounter36$pra3, _data$Encounter36$pra4, _data$Encounter36$pra5, _data$Encounter36$pra6, _data$Encounter37, _data$Encounter37$pra, _data$Encounter37$pra2, _data$Encounter38, _data$Encounter38$pra, _data$Encounter38$pra2, _data$Encounter$parti6, _data$Encounter39, _data$Encounter39$par, _data$Encounter39$par2, _data$Encounter39$par3, _data$Encounter39$par4, _data$Encounter$parti7, _data$Encounter40, _data$Encounter40$par, _data$Encounter40$par2, _data$Encounter40$par3, _data$Encounter40$par4, _data$Encounter40$par5, _data$Encounter40$par6, _data$Encounter40$par7, _data$Encounter40$par8, _data$Encounter40$par9, _data$Encounter$parti8, _data$Encounter41, _data$Encounter41$par, _data$Encounter41$par2, _data$Encounter41$par3, _data$Encounter41$par4, _data$Encounter41$par5, _data$Encounter41$par6, _data$Encounter$parti9, _data$Encounter42, _data$Encounter42$par, _data$Encounter42$par2, _data$Encounter42$par3, _data$Encounter42$par4, _data$Encounter42$par5, _data$Encounter42$par6, _data$Encounter$parti10, _data$Encounter43, _data$Encounter43$par, _data$Encounter43$par2, _data$Encounter43$par3, _data$Encounter$pract4, _data$Encounter44, _data$Encounter44$pra, _data$Encounter44$pra2, _data$Encounter44$pra3, _data$Encounter44$pra4, _data$Encounter45;
+  var _data$Encounter$visit2, _data$Encounter23, _data$Encounter24, _data$Encounter25, _data$Encounter$reaso2, _data$Encounter26, _data$Encounter26$rea, _data$Appointment7, _data$Appointment8, _data$Appointment$con2, _data$Appointment9, _data$Appointment10, _data$Appointment11, _data$Appointment12, _data$Appointment12$a, _data$Encounter$patie5, _data$Encounter27, _data$Encounter27$pat, _data$Encounter27$pat2, _data$Encounter27$pat3, _ref46, _data$Encounter28, _data$Encounter28$pat, _data$Encounter28$pat2, _data$Encounter28$pat3, _data$Encounter29, _data$Encounter29$pat, _data$Encounter29$pat2, _data$Encounter29$pat3, _data$Encounter$patie6, _data$Encounter30, _data$Encounter30$pat, _data$Encounter30$pat2, _data$Encounter31, _data$Encounter31$pat, _data$Encounter31$pat2, _data$Encounter31$pat3, _data$Encounter32, _data$Encounter32$pat, _data$Encounter32$pat2, _data$Encounter32$pat3, _data$Encounter33, _data$Encounter33$pat, _data$Encounter33$pat2, _data$Encounter33$pat3, _data$Encounter$patie7, _data$Encounter34, _data$Encounter34$pat, _data$Encounter34$pat2, _data$Encounter$patie8, _data$Encounter35, _data$Encounter35$pat, _data$Encounter35$pat2, _data$Encounter35$pat3, _data$Encounter35$pat4, _data$Encounter$pract3, _data$Encounter36, _data$Encounter36$pra, _data$Encounter36$pra2, _data$Encounter36$pra3, _data$Encounter36$pra4, _data$Encounter36$pra5, _data$Encounter36$pra6, _data$Encounter37, _data$Encounter37$pra, _data$Encounter37$pra2, _data$Encounter38, _data$Encounter38$pra, _data$Encounter38$pra2, _data$Encounter$parti6, _data$Encounter39, _data$Encounter39$par, _data$Encounter39$par2, _data$Encounter39$par3, _data$Encounter39$par4, _data$Encounter$parti7, _data$Encounter40, _data$Encounter40$par, _data$Encounter40$par2, _data$Encounter40$par3, _data$Encounter40$par4, _data$Encounter40$par5, _data$Encounter40$par6, _data$Encounter40$par7, _data$Encounter40$par8, _data$Encounter40$par9, _data$Encounter40$par10, _data$Encounter$parti8, _data$Encounter41, _data$Encounter41$par, _data$Encounter41$par2, _data$Encounter41$par3, _data$Encounter41$par4, _data$Encounter41$par5, _data$Encounter41$par6, _data$Encounter$parti9, _data$Encounter42, _data$Encounter42$par, _data$Encounter42$par2, _data$Encounter42$par3, _data$Encounter42$par4, _data$Encounter42$par5, _data$Encounter42$par6, _data$Encounter$parti10, _data$Encounter43, _data$Encounter43$par, _data$Encounter43$par2, _data$Encounter43$par3, _data$Encounter$pract4, _data$Encounter44, _data$Encounter44$pra, _data$Encounter44$pra2, _data$Encounter44$pra3, _data$Encounter44$pra4, _data$Encounter45;
 
+  debugger;
   var json = {
     visitType: (_data$Encounter$visit2 = data === null || data === void 0 ? void 0 : (_data$Encounter23 = data.Encounter) === null || _data$Encounter23 === void 0 ? void 0 : _data$Encounter23.visit_type) !== null && _data$Encounter$visit2 !== void 0 ? _data$Encounter$visit2 : "",
     encounterDate: (data === null || data === void 0 ? void 0 : (_data$Encounter24 = data.Encounter) === null || _data$Encounter24 === void 0 ? void 0 : _data$Encounter24.encounterdate) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Encounter25 = data.Encounter) === null || _data$Encounter25 === void 0 ? void 0 : _data$Encounter25.encounterdate, "DD MMM,YYYY hh:mm A") : "",
@@ -20461,7 +20474,7 @@ var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
     clinic: (data === null || data === void 0 ? void 0 : (_data$Encounter37 = data.Encounter) === null || _data$Encounter37 === void 0 ? void 0 : (_data$Encounter37$pra = _data$Encounter37.practitioner_details) === null || _data$Encounter37$pra === void 0 ? void 0 : (_data$Encounter37$pra2 = _data$Encounter37$pra[0]) === null || _data$Encounter37$pra2 === void 0 ? void 0 : _data$Encounter37$pra2.clinic) !== "" ? data === null || data === void 0 ? void 0 : (_data$Encounter38 = data.Encounter) === null || _data$Encounter38 === void 0 ? void 0 : (_data$Encounter38$pra = _data$Encounter38.practitioner_details) === null || _data$Encounter38$pra === void 0 ? void 0 : (_data$Encounter38$pra2 = _data$Encounter38$pra[0]) === null || _data$Encounter38$pra2 === void 0 ? void 0 : _data$Encounter38$pra2.clinic : null,
     //FROM PRACTITIONER
     practitionerType: (_data$Encounter$parti6 = data === null || data === void 0 ? void 0 : (_data$Encounter39 = data.Encounter) === null || _data$Encounter39 === void 0 ? void 0 : (_data$Encounter39$par = _data$Encounter39.participant) === null || _data$Encounter39$par === void 0 ? void 0 : (_data$Encounter39$par2 = _data$Encounter39$par[0]) === null || _data$Encounter39$par2 === void 0 ? void 0 : (_data$Encounter39$par3 = _data$Encounter39$par2.type) === null || _data$Encounter39$par3 === void 0 ? void 0 : (_data$Encounter39$par4 = _data$Encounter39$par3[0]) === null || _data$Encounter39$par4 === void 0 ? void 0 : _data$Encounter39$par4.display) !== null && _data$Encounter$parti6 !== void 0 ? _data$Encounter$parti6 : "",
-    practitionerRole: (_data$Encounter$parti7 = data === null || data === void 0 ? void 0 : (_data$Encounter40 = data.Encounter) === null || _data$Encounter40 === void 0 ? void 0 : (_data$Encounter40$par = _data$Encounter40.participant) === null || _data$Encounter40$par === void 0 ? void 0 : (_data$Encounter40$par2 = _data$Encounter40$par[0]) === null || _data$Encounter40$par2 === void 0 ? void 0 : (_data$Encounter40$par3 = _data$Encounter40$par2.Practitioner_id) === null || _data$Encounter40$par3 === void 0 ? void 0 : (_data$Encounter40$par4 = _data$Encounter40$par3[0]) === null || _data$Encounter40$par4 === void 0 ? void 0 : (_data$Encounter40$par5 = _data$Encounter40$par4.practitioner_role) === null || _data$Encounter40$par5 === void 0 ? void 0 : (_data$Encounter40$par6 = _data$Encounter40$par5[0]) === null || _data$Encounter40$par6 === void 0 ? void 0 : (_data$Encounter40$par7 = _data$Encounter40$par6.role) === null || _data$Encounter40$par7 === void 0 ? void 0 : (_data$Encounter40$par8 = _data$Encounter40$par7[0].coding) === null || _data$Encounter40$par8 === void 0 ? void 0 : (_data$Encounter40$par9 = _data$Encounter40$par8[0]) === null || _data$Encounter40$par9 === void 0 ? void 0 : _data$Encounter40$par9.display) !== null && _data$Encounter$parti7 !== void 0 ? _data$Encounter$parti7 : "",
+    practitionerRole: (_data$Encounter$parti7 = data === null || data === void 0 ? void 0 : (_data$Encounter40 = data.Encounter) === null || _data$Encounter40 === void 0 ? void 0 : (_data$Encounter40$par = _data$Encounter40.participant) === null || _data$Encounter40$par === void 0 ? void 0 : (_data$Encounter40$par2 = _data$Encounter40$par[0]) === null || _data$Encounter40$par2 === void 0 ? void 0 : (_data$Encounter40$par3 = _data$Encounter40$par2.Practitioner_id) === null || _data$Encounter40$par3 === void 0 ? void 0 : (_data$Encounter40$par4 = _data$Encounter40$par3[0]) === null || _data$Encounter40$par4 === void 0 ? void 0 : (_data$Encounter40$par5 = _data$Encounter40$par4.practitioner_role) === null || _data$Encounter40$par5 === void 0 ? void 0 : (_data$Encounter40$par6 = _data$Encounter40$par5[0]) === null || _data$Encounter40$par6 === void 0 ? void 0 : (_data$Encounter40$par7 = _data$Encounter40$par6.role) === null || _data$Encounter40$par7 === void 0 ? void 0 : (_data$Encounter40$par8 = _data$Encounter40$par7[0]) === null || _data$Encounter40$par8 === void 0 ? void 0 : (_data$Encounter40$par9 = _data$Encounter40$par8.coding) === null || _data$Encounter40$par9 === void 0 ? void 0 : (_data$Encounter40$par10 = _data$Encounter40$par9[0]) === null || _data$Encounter40$par10 === void 0 ? void 0 : _data$Encounter40$par10.display) !== null && _data$Encounter$parti7 !== void 0 ? _data$Encounter$parti7 : "",
     practitioner: (_data$Encounter$parti8 = data === null || data === void 0 ? void 0 : (_data$Encounter41 = data.Encounter) === null || _data$Encounter41 === void 0 ? void 0 : (_data$Encounter41$par = _data$Encounter41.participant) === null || _data$Encounter41$par === void 0 ? void 0 : (_data$Encounter41$par2 = _data$Encounter41$par[0]) === null || _data$Encounter41$par2 === void 0 ? void 0 : (_data$Encounter41$par3 = _data$Encounter41$par2.Practitioner_id) === null || _data$Encounter41$par3 === void 0 ? void 0 : (_data$Encounter41$par4 = _data$Encounter41$par3[0]) === null || _data$Encounter41$par4 === void 0 ? void 0 : (_data$Encounter41$par5 = _data$Encounter41$par4.name) === null || _data$Encounter41$par5 === void 0 ? void 0 : (_data$Encounter41$par6 = _data$Encounter41$par5[0]) === null || _data$Encounter41$par6 === void 0 ? void 0 : _data$Encounter41$par6.text) !== null && _data$Encounter$parti8 !== void 0 ? _data$Encounter$parti8 : "",
     //FOR ASSIGN QUERY
     practroleId: (_data$Encounter$parti9 = data === null || data === void 0 ? void 0 : (_data$Encounter42 = data.Encounter) === null || _data$Encounter42 === void 0 ? void 0 : (_data$Encounter42$par = _data$Encounter42.participant) === null || _data$Encounter42$par === void 0 ? void 0 : (_data$Encounter42$par2 = _data$Encounter42$par[0]) === null || _data$Encounter42$par2 === void 0 ? void 0 : (_data$Encounter42$par3 = _data$Encounter42$par2.Practitioner_id) === null || _data$Encounter42$par3 === void 0 ? void 0 : (_data$Encounter42$par4 = _data$Encounter42$par3[0]) === null || _data$Encounter42$par4 === void 0 ? void 0 : (_data$Encounter42$par5 = _data$Encounter42$par4.practitioner_role) === null || _data$Encounter42$par5 === void 0 ? void 0 : (_data$Encounter42$par6 = _data$Encounter42$par5[0]) === null || _data$Encounter42$par6 === void 0 ? void 0 : _data$Encounter42$par6._id) !== null && _data$Encounter$parti9 !== void 0 ? _data$Encounter$parti9 : "",
@@ -20590,23 +20603,24 @@ var REASSIGN_LIST = createAsyncThunk("dashboardApiSlice/reassignList", /*#__PURE
         case 6:
           data = _context23.sent;
           readJSON = generateReadJSON_Reassign(data.result[0] ? data.result[0] : null);
+          debugger;
           return _context23.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: readJSON
           }));
 
-        case 11:
-          _context23.prev = 11;
+        case 12:
+          _context23.prev = 12;
           _context23.t0 = _context23["catch"](2);
           return _context23.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context23.t0.message
           })));
 
-        case 14:
+        case 15:
         case "end":
           return _context23.stop();
       }
     }
-  }, _callee23, null, [[2, 11]]);
+  }, _callee23, null, [[2, 12]]);
 }))); //CLOSE_CONSULTATION
 
 var CLOSE_CONSULTATION = createAsyncThunk("dashboardApiSlice/closeConsultation", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee24() {
@@ -37971,7 +37985,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && 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' && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'"
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getFirstVisits: function getFirstVisits(data) {
@@ -37982,7 +37996,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getOtherVisits: function getOtherVisits(data) {
@@ -37993,7 +38007,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getWalkIns: function getWalkIns(data) {
@@ -38004,7 +38018,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getNewPatients: function getNewPatients(data) {
@@ -38015,7 +38029,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getTodayVisits: function getTodayVisits(data) {
@@ -38026,7 +38040,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' "
       },
-      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
+      return_fields: "{Appointment:merge(Appointment,{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)})),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:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   // NURSE
@@ -38086,7 +38100,7 @@ var query$4 = {
         Practitioner: "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, "'"),
         Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(data === null || data === void 0 ? void 0 : data.orgIDInt, " &&  DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'")
       },
-      return_fields: "merge(Encounter,{status:document(Encounter.status),patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(for Appointment in Appointment filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{status:document(Encounter.status),patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(for Appointment in Appointment filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getWalkInsNurse: function getWalkInsNurse(data) {
@@ -38110,7 +38124,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && 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(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getFirstVisitsDoctor: function getFirstVisitsDoctor(data) {
@@ -38121,7 +38135,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getNewPatientsDoctor: function getNewPatientsDoctor(data) {
@@ -38132,7 +38146,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getOtherVisitsDoctor: function getOtherVisitsDoctor(data) {
@@ -38143,7 +38157,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getTodayVisitsDoctor: function getTodayVisitsDoctor(data) {
@@ -38154,7 +38168,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, "  && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' "),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   },
   getWalkInsDoctor: function getWalkInsDoctor(data) {
@@ -38165,7 +38179,7 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {id : pat.id, _id : pat._id,name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{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)})),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)}))}))})"
     };
   }
 };
@@ -38196,28 +38210,34 @@ var GET_APPOINTMENTS = createAsyncThunk("appointmentStatsApiSlice/getAppointment
         case 5:
           data = _context.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (_) {
-            var _$Appointment, _$Appointment$PersonI, _$Appointment$PersonI2, _$Appointment$PersonI3, _$Appointment$PersonI4, _$Appointment2, _$Appointment2$Person, _$Appointment2$Person2, _$Appointment2$Person3, _$Appointment2$Person4, _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Appointment3, _$Appointment4, _$Appointment5, _$Appointment6, _$Appointment7, _$Appointment7$Specia, _$Encounter3, _$Encounter3$practiti, _$Encounter3$practiti2, _$Appointment8, _$Appointment8$Person, _$Appointment8$Person2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Encounter5, _$Encounter6, _$Encounter6$status;
+            var _$Appointment, _$Appointment$PersonI, _$Appointment$PersonI2, _$Appointment$PersonI3, _$Appointment$PersonI4, _$Appointment2, _$Appointment2$Person, _$Appointment2$Person2, _$Appointment2$Person3, _$Appointment2$Person4, _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Appointment3, _$Appointment3$Person, _$Appointment3$Person2, _$Appointment4, _$Appointment5, _$Appointment6, _$Appointment7, _$Appointment8, _$Appointment8$Specia, _$Encounter3, _$Encounter3$practiti, _$Encounter3$practiti2, _$Appointment9, _$Appointment9$Person, _$Appointment9$Person2, _$Appointment10, _$Appointment10$Perso, _$Appointment10$Perso2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Encounter5, _$Encounter6, _$Encounter6$status, _$Encounter$appointme, _$Encounter7, _$Encounter7$appointm;
 
             return {
               img: (_ === null || _ === void 0 ? void 0 : (_$Appointment = _.Appointment) === null || _$Appointment === void 0 ? void 0 : (_$Appointment$PersonI = _$Appointment.PersonID) === null || _$Appointment$PersonI === void 0 ? void 0 : (_$Appointment$PersonI2 = _$Appointment$PersonI[0]) === null || _$Appointment$PersonI2 === void 0 ? void 0 : (_$Appointment$PersonI3 = _$Appointment$PersonI2.photo) === null || _$Appointment$PersonI3 === void 0 ? void 0 : (_$Appointment$PersonI4 = _$Appointment$PersonI3[0]) === null || _$Appointment$PersonI4 === void 0 ? void 0 : _$Appointment$PersonI4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment2 = _.Appointment) === null || _$Appointment2 === void 0 ? void 0 : (_$Appointment2$Person = _$Appointment2.PersonID) === null || _$Appointment2$Person === void 0 ? void 0 : (_$Appointment2$Person2 = _$Appointment2$Person[0]) === null || _$Appointment2$Person2 === void 0 ? void 0 : (_$Appointment2$Person3 = _$Appointment2$Person2.photo) === null || _$Appointment2$Person3 === void 0 ? void 0 : (_$Appointment2$Person4 = _$Appointment2$Person3[0]) === null || _$Appointment2$Person4 === void 0 ? void 0 : _$Appointment2$Person4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment3 = _.Appointment) === null || _$Appointment3 === void 0 ? void 0 : _$Appointment3.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment4 = _.Appointment) === null || _$Appointment4 === void 0 ? void 0 : _$Appointment4.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment5 = _.Appointment) === null || _$Appointment5 === void 0 ? void 0 : _$Appointment5.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment6 = _.Appointment) === null || _$Appointment6 === void 0 ? void 0 : _$Appointment6.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment7 = _.Appointment) === null || _$Appointment7 === void 0 ? void 0 : (_$Appointment7$Specia = _$Appointment7.SpecialtyID) === null || _$Appointment7$Specia === void 0 ? void 0 : _$Appointment7$Specia.map(function (spl) {
+              enId: _.Encounter.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment3 = _.Appointment) === null || _$Appointment3 === void 0 ? void 0 : (_$Appointment3$Person = _$Appointment3.PersonID) === null || _$Appointment3$Person === void 0 ? void 0 : (_$Appointment3$Person2 = _$Appointment3$Person[0]) === null || _$Appointment3$Person2 === void 0 ? void 0 : _$Appointment3$Person2.birthDay),
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment4 = _.Appointment) === null || _$Appointment4 === void 0 ? void 0 : _$Appointment4.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment5 = _.Appointment) === null || _$Appointment5 === void 0 ? void 0 : _$Appointment5.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment6 = _.Appointment) === null || _$Appointment6 === void 0 ? void 0 : _$Appointment6.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment7 = _.Appointment) === null || _$Appointment7 === void 0 ? void 0 : _$Appointment7.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment8 = _.Appointment) === null || _$Appointment8 === void 0 ? void 0 : (_$Appointment8$Specia = _$Appointment8.SpecialtyID) === null || _$Appointment8$Specia === void 0 ? void 0 : _$Appointment8$Specia.map(function (spl) {
                 var _spl$coding, _spl$coding$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding = spl.coding) === null || _spl$coding === void 0 ? void 0 : (_spl$coding$ = _spl$coding[0]) === null || _spl$coding$ === void 0 ? void 0 : _spl$coding$.display;
               }).join(", "),
               clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter3 = _.Encounter) === null || _$Encounter3 === void 0 ? void 0 : (_$Encounter3$practiti = _$Encounter3.practitioner_details) === null || _$Encounter3$practiti === void 0 ? void 0 : (_$Encounter3$practiti2 = _$Encounter3$practiti[0]) === null || _$Encounter3$practiti2 === void 0 ? void 0 : _$Encounter3$practiti2.clinic,
-              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment8 = _.Appointment) === null || _$Appointment8 === void 0 ? void 0 : (_$Appointment8$Person = _$Appointment8.PersonID) === null || _$Appointment8$Person === void 0 ? void 0 : (_$Appointment8$Person2 = _$Appointment8$Person[0]) === null || _$Appointment8$Person2 === void 0 ? void 0 : _$Appointment8$Person2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$patient_ = _$Encounter4.patient_id) === null || _$Encounter4$patient_ === void 0 ? void 0 : (_$Encounter4$patient_2 = _$Encounter4$patient_[0]) === null || _$Encounter4$patient_2 === void 0 ? void 0 : (_$Encounter4$patient_3 = _$Encounter4$patient_2.telecom) === null || _$Encounter4$patient_3 === void 0 ? void 0 : (_$Encounter4$patient_4 = _$Encounter4$patient_3[0]) === null || _$Encounter4$patient_4 === void 0 ? void 0 : _$Encounter4$patient_4.value),
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment9 = _.Appointment) === null || _$Appointment9 === void 0 ? void 0 : (_$Appointment9$Person = _$Appointment9.PersonID) === null || _$Appointment9$Person === void 0 ? void 0 : (_$Appointment9$Person2 = _$Appointment9$Person[0]) === null || _$Appointment9$Person2 === void 0 ? void 0 : _$Appointment9$Person2.birthDay,
+              gender: _ === null || _ === void 0 ? void 0 : (_$Appointment10 = _.Appointment) === null || _$Appointment10 === void 0 ? void 0 : (_$Appointment10$Perso = _$Appointment10.PersonID) === null || _$Appointment10$Perso === void 0 ? void 0 : (_$Appointment10$Perso2 = _$Appointment10$Perso[0]) === null || _$Appointment10$Perso2 === void 0 ? void 0 : _$Appointment10$Perso2.gender,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$patient_ = _$Encounter4.patient_id) === null || _$Encounter4$patient_ === void 0 ? void 0 : (_$Encounter4$patient_2 = _$Encounter4$patient_[0]) === null || _$Encounter4$patient_2 === void 0 ? void 0 : (_$Encounter4$patient_3 = _$Encounter4$patient_2.telecom) === null || _$Encounter4$patient_3 === void 0 ? void 0 : (_$Encounter4$patient_4 = _$Encounter4$patient_3[0]) === null || _$Encounter4$patient_4 === void 0 ? void 0 : _$Encounter4$patient_4.value,
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter5 = _.Encounter) === null || _$Encounter5 === void 0 ? void 0 : _$Encounter5.visit_type,
               appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter6 = _.Encounter) === null || _$Encounter6 === void 0 ? void 0 : (_$Encounter6$status = _$Encounter6.status) === null || _$Encounter6$status === void 0 ? void 0 : _$Encounter6$status.display,
+              appNo: (_$Encounter$appointme = _ === null || _ === void 0 ? void 0 : (_$Encounter7 = _.Encounter) === null || _$Encounter7 === void 0 ? void 0 : (_$Encounter7$appointm = _$Encounter7.appointmentId) === null || _$Encounter7$appointm === void 0 ? void 0 : _$Encounter7$appointm[0]) !== null && _$Encounter$appointme !== void 0 ? _$Encounter$appointme : "",
+              type: "OP",
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
-              "View Profile": true
+              "View Profile": true,
+              data: _
             };
           }) : [];
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38262,24 +38282,30 @@ var GET_FIRST_VISITS = createAsyncThunk("appointmentStatsApiSlice/getFirstVisits
         case 5:
           data = _context2.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : _data$result2.map(function (_) {
-            var _$Appointment9, _$Appointment9$Person, _$Appointment9$Person2, _$Appointment9$Person3, _$Appointment9$Person4, _$Appointment10, _$Appointment10$Perso, _$Appointment10$Perso2, _$Appointment10$Perso3, _$Appointment10$Perso4, _$Encounter7, _$Encounter7$patient_, _$Encounter7$patient_2, _$Encounter7$patient_3, _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Appointment11, _$Appointment12, _$Appointment13, _$Appointment14, _$Appointment15, _$Appointment15$Speci, _$Encounter9, _$Encounter9$practiti, _$Encounter9$practiti2, _$Appointment16, _$Appointment16$Perso, _$Appointment16$Perso2, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter10$patient3, _$Encounter10$patient4, _$Encounter11, _$Encounter12, _$Encounter12$status;
+            var _$Appointment11, _$Appointment11$Perso, _$Appointment11$Perso2, _$Appointment11$Perso3, _$Appointment11$Perso4, _$Appointment12, _$Appointment12$Perso, _$Appointment12$Perso2, _$Appointment12$Perso3, _$Appointment12$Perso4, _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Encounter8$patient_3, _$Encounter9, _$Encounter9$patient_, _$Encounter9$patient_2, _$Appointment13, _$Appointment14, _$Appointment15, _$Appointment16, _$Appointment17, _$Appointment17$Speci, _$Encounter10, _$Encounter10$practit, _$Encounter10$practit2, _$Appointment18, _$Appointment18$Perso, _$Appointment18$Perso2, _$Encounter11, _$Encounter11$patient, _$Encounter11$patient2, _$Encounter11$patient3, _$Encounter11$patient4, _$Encounter12, _$Encounter13, _$Encounter13$status, _$Encounter$appointme2, _$Encounter14, _$Encounter14$appoint, _$Appointment19, _$Appointment19$Perso, _$Appointment19$Perso2, _$Appointment20, _$Appointment20$Perso, _$Appointment20$Perso2;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment9 = _.Appointment) === null || _$Appointment9 === void 0 ? void 0 : (_$Appointment9$Person = _$Appointment9.PersonID) === null || _$Appointment9$Person === void 0 ? void 0 : (_$Appointment9$Person2 = _$Appointment9$Person[0]) === null || _$Appointment9$Person2 === void 0 ? void 0 : (_$Appointment9$Person3 = _$Appointment9$Person2.photo) === null || _$Appointment9$Person3 === void 0 ? void 0 : (_$Appointment9$Person4 = _$Appointment9$Person3[0]) === null || _$Appointment9$Person4 === void 0 ? void 0 : _$Appointment9$Person4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment10 = _.Appointment) === null || _$Appointment10 === void 0 ? void 0 : (_$Appointment10$Perso = _$Appointment10.PersonID) === null || _$Appointment10$Perso === void 0 ? void 0 : (_$Appointment10$Perso2 = _$Appointment10$Perso[0]) === null || _$Appointment10$Perso2 === void 0 ? void 0 : (_$Appointment10$Perso3 = _$Appointment10$Perso2.photo) === null || _$Appointment10$Perso3 === void 0 ? void 0 : (_$Appointment10$Perso4 = _$Appointment10$Perso3[0]) === null || _$Appointment10$Perso4 === void 0 ? void 0 : _$Appointment10$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter7 = _.Encounter) === null || _$Encounter7 === void 0 ? void 0 : (_$Encounter7$patient_ = _$Encounter7.patient_id) === null || _$Encounter7$patient_ === void 0 ? void 0 : (_$Encounter7$patient_2 = _$Encounter7$patient_[0]) === null || _$Encounter7$patient_2 === void 0 ? void 0 : (_$Encounter7$patient_3 = _$Encounter7$patient_2.name) === null || _$Encounter7$patient_3 === void 0 ? void 0 : _$Encounter7$patient_3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : _$Encounter8$patient_2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment11 = _.Appointment) === null || _$Appointment11 === void 0 ? void 0 : _$Appointment11.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment12 = _.Appointment) === null || _$Appointment12 === void 0 ? void 0 : _$Appointment12.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : _$Appointment13.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : _$Appointment14.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment15 = _.Appointment) === null || _$Appointment15 === void 0 ? void 0 : (_$Appointment15$Speci = _$Appointment15.SpecialtyID) === null || _$Appointment15$Speci === void 0 ? void 0 : _$Appointment15$Speci.map(function (spl) {
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment11 = _.Appointment) === null || _$Appointment11 === void 0 ? void 0 : (_$Appointment11$Perso = _$Appointment11.PersonID) === null || _$Appointment11$Perso === void 0 ? void 0 : (_$Appointment11$Perso2 = _$Appointment11$Perso[0]) === null || _$Appointment11$Perso2 === void 0 ? void 0 : (_$Appointment11$Perso3 = _$Appointment11$Perso2.photo) === null || _$Appointment11$Perso3 === void 0 ? void 0 : (_$Appointment11$Perso4 = _$Appointment11$Perso3[0]) === null || _$Appointment11$Perso4 === void 0 ? void 0 : _$Appointment11$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment12 = _.Appointment) === null || _$Appointment12 === void 0 ? void 0 : (_$Appointment12$Perso = _$Appointment12.PersonID) === null || _$Appointment12$Perso === void 0 ? void 0 : (_$Appointment12$Perso2 = _$Appointment12$Perso[0]) === null || _$Appointment12$Perso2 === void 0 ? void 0 : (_$Appointment12$Perso3 = _$Appointment12$Perso2.photo) === null || _$Appointment12$Perso3 === void 0 ? void 0 : (_$Appointment12$Perso4 = _$Appointment12$Perso3[0]) === null || _$Appointment12$Perso4 === void 0 ? void 0 : _$Appointment12$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$patient_ = _$Encounter9.patient_id) === null || _$Encounter9$patient_ === void 0 ? void 0 : (_$Encounter9$patient_2 = _$Encounter9$patient_[0]) === null || _$Encounter9$patient_2 === void 0 ? void 0 : _$Encounter9$patient_2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : _$Appointment13.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : _$Appointment14.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment15 = _.Appointment) === null || _$Appointment15 === void 0 ? void 0 : _$Appointment15.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment16 = _.Appointment) === null || _$Appointment16 === void 0 ? void 0 : _$Appointment16.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : (_$Appointment17$Speci = _$Appointment17.SpecialtyID) === null || _$Appointment17$Speci === void 0 ? void 0 : _$Appointment17$Speci.map(function (spl) {
                 var _spl$coding2, _spl$coding2$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding2 = spl.coding) === null || _spl$coding2 === void 0 ? void 0 : (_spl$coding2$ = _spl$coding2[0]) === null || _spl$coding2$ === void 0 ? void 0 : _spl$coding2$.display;
               }).join(", "),
-              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$practiti = _$Encounter9.practitioner_details) === null || _$Encounter9$practiti === void 0 ? void 0 : (_$Encounter9$practiti2 = _$Encounter9$practiti[0]) === null || _$Encounter9$practiti2 === void 0 ? void 0 : _$Encounter9$practiti2.clinic,
-              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment16 = _.Appointment) === null || _$Appointment16 === void 0 ? void 0 : (_$Appointment16$Perso = _$Appointment16.PersonID) === null || _$Appointment16$Perso === void 0 ? void 0 : (_$Appointment16$Perso2 = _$Appointment16$Perso[0]) === null || _$Appointment16$Perso2 === void 0 ? void 0 : _$Appointment16$Perso2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter10 = _.Encounter) === null || _$Encounter10 === void 0 ? void 0 : (_$Encounter10$patient = _$Encounter10.patient_id) === null || _$Encounter10$patient === void 0 ? void 0 : (_$Encounter10$patient2 = _$Encounter10$patient[0]) === null || _$Encounter10$patient2 === void 0 ? void 0 : (_$Encounter10$patient3 = _$Encounter10$patient2.telecom) === null || _$Encounter10$patient3 === void 0 ? void 0 : (_$Encounter10$patient4 = _$Encounter10$patient3[0]) === null || _$Encounter10$patient4 === void 0 ? void 0 : _$Encounter10$patient4.value),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : _$Encounter11.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$status = _$Encounter12.status) === null || _$Encounter12$status === void 0 ? void 0 : _$Encounter12$status.display,
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter10 = _.Encounter) === null || _$Encounter10 === void 0 ? void 0 : (_$Encounter10$practit = _$Encounter10.practitioner_details) === null || _$Encounter10$practit === void 0 ? void 0 : (_$Encounter10$practit2 = _$Encounter10$practit[0]) === null || _$Encounter10$practit2 === void 0 ? void 0 : _$Encounter10$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment18 = _.Appointment) === null || _$Appointment18 === void 0 ? void 0 : (_$Appointment18$Perso = _$Appointment18.PersonID) === null || _$Appointment18$Perso === void 0 ? void 0 : (_$Appointment18$Perso2 = _$Appointment18$Perso[0]) === null || _$Appointment18$Perso2 === void 0 ? void 0 : _$Appointment18$Perso2.birthDay,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : (_$Encounter11$patient = _$Encounter11.patient_id) === null || _$Encounter11$patient === void 0 ? void 0 : (_$Encounter11$patient2 = _$Encounter11$patient[0]) === null || _$Encounter11$patient2 === void 0 ? void 0 : (_$Encounter11$patient3 = _$Encounter11$patient2.telecom) === null || _$Encounter11$patient3 === void 0 ? void 0 : (_$Encounter11$patient4 = _$Encounter11$patient3[0]) === null || _$Encounter11$patient4 === void 0 ? void 0 : _$Encounter11$patient4.value,
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : _$Encounter12.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : (_$Encounter13$status = _$Encounter13.status) === null || _$Encounter13$status === void 0 ? void 0 : _$Encounter13$status.display,
+              type: "OP",
+              appNo: (_$Encounter$appointme2 = _ === null || _ === void 0 ? void 0 : (_$Encounter14 = _.Encounter) === null || _$Encounter14 === void 0 ? void 0 : (_$Encounter14$appoint = _$Encounter14.appointmentId) === null || _$Encounter14$appoint === void 0 ? void 0 : _$Encounter14$appoint[0]) !== null && _$Encounter$appointme2 !== void 0 ? _$Encounter$appointme2 : "",
+              data: _,
+              enId: _.Encounter.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment19 = _.Appointment) === null || _$Appointment19 === void 0 ? void 0 : (_$Appointment19$Perso = _$Appointment19.PersonID) === null || _$Appointment19$Perso === void 0 ? void 0 : (_$Appointment19$Perso2 = _$Appointment19$Perso[0]) === null || _$Appointment19$Perso2 === void 0 ? void 0 : _$Appointment19$Perso2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : (_$Appointment20$Perso = _$Appointment20.PersonID) === null || _$Appointment20$Perso === void 0 ? void 0 : (_$Appointment20$Perso2 = _$Appointment20$Perso[0]) === null || _$Appointment20$Perso2 === void 0 ? void 0 : _$Appointment20$Perso2.gender,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -38328,24 +38354,30 @@ var GET_OTHER_VISITS = createAsyncThunk("appointmentStatsApiSlice/getOtherVisits
         case 5:
           data = _context3.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result3 = data.result) === null || _data$result3 === void 0 ? void 0 : _data$result3.map(function (_) {
-            var _$Appointment17, _$Appointment17$Perso, _$Appointment17$Perso2, _$Appointment17$Perso3, _$Appointment17$Perso4, _$Appointment18, _$Appointment18$Perso, _$Appointment18$Perso2, _$Appointment18$Perso3, _$Appointment18$Perso4, _$Encounter13, _$Encounter13$patient, _$Encounter13$patient2, _$Encounter13$patient3, _$Encounter14, _$Encounter14$patient, _$Encounter14$patient2, _$Appointment19, _$Appointment20, _$Appointment21, _$Appointment22, _$Appointment23, _$Appointment23$Speci, _$Encounter15, _$Encounter15$practit, _$Encounter15$practit2, _$Appointment24, _$Appointment24$Perso, _$Appointment24$Perso2, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2, _$Encounter16$patient3, _$Encounter16$patient4, _$Encounter17, _$Encounter18, _$Encounter18$status;
+            var _$Appointment21, _$Appointment21$Perso, _$Appointment21$Perso2, _$Appointment21$Perso3, _$Appointment21$Perso4, _$Appointment22, _$Appointment22$Perso, _$Appointment22$Perso2, _$Appointment22$Perso3, _$Appointment22$Perso4, _$Encounter15, _$Encounter15$patient, _$Encounter15$patient2, _$Encounter15$patient3, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2, _$Appointment23, _$Appointment24, _$Appointment25, _$Appointment26, _$Appointment27, _$Appointment27$Speci, _$Encounter17, _$Encounter17$practit, _$Encounter17$practit2, _$Appointment28, _$Appointment28$Perso, _$Appointment28$Perso2, _$Encounter$appointme3, _$Encounter18, _$Encounter18$appoint, _$Appointment29, _$Appointment29$Perso, _$Appointment29$Perso2, _$Appointment30, _$Appointment30$Perso, _$Appointment30$Perso2, _$Encounter19, _$Encounter19$patient, _$Encounter19$patient2, _$Encounter19$patient3, _$Encounter19$patient4, _$Encounter20, _$Encounter21, _$Encounter21$status;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : (_$Appointment17$Perso = _$Appointment17.PersonID) === null || _$Appointment17$Perso === void 0 ? void 0 : (_$Appointment17$Perso2 = _$Appointment17$Perso[0]) === null || _$Appointment17$Perso2 === void 0 ? void 0 : (_$Appointment17$Perso3 = _$Appointment17$Perso2.photo) === null || _$Appointment17$Perso3 === void 0 ? void 0 : (_$Appointment17$Perso4 = _$Appointment17$Perso3[0]) === null || _$Appointment17$Perso4 === void 0 ? void 0 : _$Appointment17$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment18 = _.Appointment) === null || _$Appointment18 === void 0 ? void 0 : (_$Appointment18$Perso = _$Appointment18.PersonID) === null || _$Appointment18$Perso === void 0 ? void 0 : (_$Appointment18$Perso2 = _$Appointment18$Perso[0]) === null || _$Appointment18$Perso2 === void 0 ? void 0 : (_$Appointment18$Perso3 = _$Appointment18$Perso2.photo) === null || _$Appointment18$Perso3 === void 0 ? void 0 : (_$Appointment18$Perso4 = _$Appointment18$Perso3[0]) === null || _$Appointment18$Perso4 === void 0 ? void 0 : _$Appointment18$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : (_$Encounter13$patient = _$Encounter13.patient_id) === null || _$Encounter13$patient === void 0 ? void 0 : (_$Encounter13$patient2 = _$Encounter13$patient[0]) === null || _$Encounter13$patient2 === void 0 ? void 0 : (_$Encounter13$patient3 = _$Encounter13$patient2.name) === null || _$Encounter13$patient3 === void 0 ? void 0 : _$Encounter13$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter14 = _.Encounter) === null || _$Encounter14 === void 0 ? void 0 : (_$Encounter14$patient = _$Encounter14.patient_id) === null || _$Encounter14$patient === void 0 ? void 0 : (_$Encounter14$patient2 = _$Encounter14$patient[0]) === null || _$Encounter14$patient2 === void 0 ? void 0 : _$Encounter14$patient2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment19 = _.Appointment) === null || _$Appointment19 === void 0 ? void 0 : _$Appointment19.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : _$Appointment20.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : _$Appointment21.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : _$Appointment22.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : (_$Appointment23$Speci = _$Appointment23.SpecialtyID) === null || _$Appointment23$Speci === void 0 ? void 0 : _$Appointment23$Speci.map(function (spl) {
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : (_$Appointment21$Perso = _$Appointment21.PersonID) === null || _$Appointment21$Perso === void 0 ? void 0 : (_$Appointment21$Perso2 = _$Appointment21$Perso[0]) === null || _$Appointment21$Perso2 === void 0 ? void 0 : (_$Appointment21$Perso3 = _$Appointment21$Perso2.photo) === null || _$Appointment21$Perso3 === void 0 ? void 0 : (_$Appointment21$Perso4 = _$Appointment21$Perso3[0]) === null || _$Appointment21$Perso4 === void 0 ? void 0 : _$Appointment21$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : (_$Appointment22$Perso = _$Appointment22.PersonID) === null || _$Appointment22$Perso === void 0 ? void 0 : (_$Appointment22$Perso2 = _$Appointment22$Perso[0]) === null || _$Appointment22$Perso2 === void 0 ? void 0 : (_$Appointment22$Perso3 = _$Appointment22$Perso2.photo) === null || _$Appointment22$Perso3 === void 0 ? void 0 : (_$Appointment22$Perso4 = _$Appointment22$Perso3[0]) === null || _$Appointment22$Perso4 === void 0 ? void 0 : _$Appointment22$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$patient = _$Encounter15.patient_id) === null || _$Encounter15$patient === void 0 ? void 0 : (_$Encounter15$patient2 = _$Encounter15$patient[0]) === null || _$Encounter15$patient2 === void 0 ? void 0 : (_$Encounter15$patient3 = _$Encounter15$patient2.name) === null || _$Encounter15$patient3 === void 0 ? void 0 : _$Encounter15$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter16 = _.Encounter) === null || _$Encounter16 === void 0 ? void 0 : (_$Encounter16$patient = _$Encounter16.patient_id) === null || _$Encounter16$patient === void 0 ? void 0 : (_$Encounter16$patient2 = _$Encounter16$patient[0]) === null || _$Encounter16$patient2 === void 0 ? void 0 : _$Encounter16$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : _$Appointment23.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment24 = _.Appointment) === null || _$Appointment24 === void 0 ? void 0 : _$Appointment24.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment25 = _.Appointment) === null || _$Appointment25 === void 0 ? void 0 : _$Appointment25.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment26 = _.Appointment) === null || _$Appointment26 === void 0 ? void 0 : _$Appointment26.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : (_$Appointment27$Speci = _$Appointment27.SpecialtyID) === null || _$Appointment27$Speci === void 0 ? void 0 : _$Appointment27$Speci.map(function (spl) {
                 var _spl$coding3, _spl$coding3$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding3 = spl.coding) === null || _spl$coding3 === void 0 ? void 0 : (_spl$coding3$ = _spl$coding3[0]) === null || _spl$coding3$ === void 0 ? void 0 : _spl$coding3$.display;
               }).join(", "),
-              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$practit = _$Encounter15.practitioner_details) === null || _$Encounter15$practit === void 0 ? void 0 : (_$Encounter15$practit2 = _$Encounter15$practit[0]) === null || _$Encounter15$practit2 === void 0 ? void 0 : _$Encounter15$practit2.clinic,
-              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment24 = _.Appointment) === null || _$Appointment24 === void 0 ? void 0 : (_$Appointment24$Perso = _$Appointment24.PersonID) === null || _$Appointment24$Perso === void 0 ? void 0 : (_$Appointment24$Perso2 = _$Appointment24$Perso[0]) === null || _$Appointment24$Perso2 === void 0 ? void 0 : _$Appointment24$Perso2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter16 = _.Encounter) === null || _$Encounter16 === void 0 ? void 0 : (_$Encounter16$patient = _$Encounter16.patient_id) === null || _$Encounter16$patient === void 0 ? void 0 : (_$Encounter16$patient2 = _$Encounter16$patient[0]) === null || _$Encounter16$patient2 === void 0 ? void 0 : (_$Encounter16$patient3 = _$Encounter16$patient2.telecom) === null || _$Encounter16$patient3 === void 0 ? void 0 : (_$Encounter16$patient4 = _$Encounter16$patient3[0]) === null || _$Encounter16$patient4 === void 0 ? void 0 : _$Encounter16$patient4.value),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter17 = _.Encounter) === null || _$Encounter17 === void 0 ? void 0 : _$Encounter17.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter18 = _.Encounter) === null || _$Encounter18 === void 0 ? void 0 : (_$Encounter18$status = _$Encounter18.status) === null || _$Encounter18$status === void 0 ? void 0 : _$Encounter18$status.display,
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter17 = _.Encounter) === null || _$Encounter17 === void 0 ? void 0 : (_$Encounter17$practit = _$Encounter17.practitioner_details) === null || _$Encounter17$practit === void 0 ? void 0 : (_$Encounter17$practit2 = _$Encounter17$practit[0]) === null || _$Encounter17$practit2 === void 0 ? void 0 : _$Encounter17$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : (_$Appointment28$Perso = _$Appointment28.PersonID) === null || _$Appointment28$Perso === void 0 ? void 0 : (_$Appointment28$Perso2 = _$Appointment28$Perso[0]) === null || _$Appointment28$Perso2 === void 0 ? void 0 : _$Appointment28$Perso2.birthDay,
+              type: "OP",
+              appNo: (_$Encounter$appointme3 = _ === null || _ === void 0 ? void 0 : (_$Encounter18 = _.Encounter) === null || _$Encounter18 === void 0 ? void 0 : (_$Encounter18$appoint = _$Encounter18.appointmentId) === null || _$Encounter18$appoint === void 0 ? void 0 : _$Encounter18$appoint[0]) !== null && _$Encounter$appointme3 !== void 0 ? _$Encounter$appointme3 : "",
+              data: _,
+              enId: _.Encounter.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : (_$Appointment29$Perso = _$Appointment29.PersonID) === null || _$Appointment29$Perso === void 0 ? void 0 : (_$Appointment29$Perso2 = _$Appointment29$Perso[0]) === null || _$Appointment29$Perso2 === void 0 ? void 0 : _$Appointment29$Perso2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$Appointment30 = _.Appointment) === null || _$Appointment30 === void 0 ? void 0 : (_$Appointment30$Perso = _$Appointment30.PersonID) === null || _$Appointment30$Perso === void 0 ? void 0 : (_$Appointment30$Perso2 = _$Appointment30$Perso[0]) === null || _$Appointment30$Perso2 === void 0 ? void 0 : _$Appointment30$Perso2.gender,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : (_$Encounter19$patient = _$Encounter19.patient_id) === null || _$Encounter19$patient === void 0 ? void 0 : (_$Encounter19$patient2 = _$Encounter19$patient[0]) === null || _$Encounter19$patient2 === void 0 ? void 0 : (_$Encounter19$patient3 = _$Encounter19$patient2.telecom) === null || _$Encounter19$patient3 === void 0 ? void 0 : (_$Encounter19$patient4 = _$Encounter19$patient3[0]) === null || _$Encounter19$patient4 === void 0 ? void 0 : _$Encounter19$patient4.value,
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : _$Encounter20.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$status = _$Encounter21.status) === null || _$Encounter21$status === void 0 ? void 0 : _$Encounter21$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -38394,24 +38426,30 @@ var GET_WALK_INS = createAsyncThunk("appointmentStatsApiSlice/getWalkIns", /*#__
         case 5:
           data = _context4.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result4 = data.result) === null || _data$result4 === void 0 ? void 0 : _data$result4.map(function (_) {
-            var _$Appointment25, _$Appointment25$Perso, _$Appointment25$Perso2, _$Appointment25$Perso3, _$Appointment25$Perso4, _$Appointment26, _$Appointment26$Perso, _$Appointment26$Perso2, _$Appointment26$Perso3, _$Appointment26$Perso4, _$Encounter19, _$Encounter19$patient, _$Encounter19$patient2, _$Encounter19$patient3, _$Encounter20, _$Encounter20$patient, _$Encounter20$patient2, _$Appointment27, _$Appointment28, _$Appointment29, _$Appointment30, _$Appointment31, _$Appointment31$Speci, _$Encounter21, _$Encounter21$practit, _$Encounter21$practit2, _$Appointment32, _$Appointment32$Perso, _$Appointment32$Perso2, _$Encounter22, _$Encounter22$patient, _$Encounter22$patient2, _$Encounter22$patient3, _$Encounter22$patient4, _$Encounter23, _$Encounter24, _$Encounter24$status;
+            var _$Appointment31, _$Appointment31$Perso, _$Appointment31$Perso2, _$Appointment31$Perso3, _$Appointment31$Perso4, _$Appointment32, _$Appointment32$Perso, _$Appointment32$Perso2, _$Appointment32$Perso3, _$Appointment32$Perso4, _$Encounter22, _$Encounter22$patient, _$Encounter22$patient2, _$Encounter22$patient3, _$Encounter23, _$Encounter23$patient, _$Encounter23$patient2, _$Appointment33, _$Appointment34, _$Appointment35, _$Appointment36, _$Appointment37, _$Appointment37$Speci, _$Encounter24, _$Encounter24$practit, _$Encounter24$practit2, _$Appointment38, _$Appointment38$Perso, _$Appointment38$Perso2, _$Encounter$appointme4, _$Encounter25, _$Encounter25$appoint, _$Appointment39, _$Appointment39$Perso, _$Appointment39$Perso2, _$Appointment40, _$Appointment40$Perso, _$Appointment40$Perso2, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Encounter26$patient3, _$Encounter26$patient4, _$Encounter27, _$Encounter28, _$Encounter28$status;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment25 = _.Appointment) === null || _$Appointment25 === void 0 ? void 0 : (_$Appointment25$Perso = _$Appointment25.PersonID) === null || _$Appointment25$Perso === void 0 ? void 0 : (_$Appointment25$Perso2 = _$Appointment25$Perso[0]) === null || _$Appointment25$Perso2 === void 0 ? void 0 : (_$Appointment25$Perso3 = _$Appointment25$Perso2.photo) === null || _$Appointment25$Perso3 === void 0 ? void 0 : (_$Appointment25$Perso4 = _$Appointment25$Perso3[0]) === null || _$Appointment25$Perso4 === void 0 ? void 0 : _$Appointment25$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment26 = _.Appointment) === null || _$Appointment26 === void 0 ? void 0 : (_$Appointment26$Perso = _$Appointment26.PersonID) === null || _$Appointment26$Perso === void 0 ? void 0 : (_$Appointment26$Perso2 = _$Appointment26$Perso[0]) === null || _$Appointment26$Perso2 === void 0 ? void 0 : (_$Appointment26$Perso3 = _$Appointment26$Perso2.photo) === null || _$Appointment26$Perso3 === void 0 ? void 0 : (_$Appointment26$Perso4 = _$Appointment26$Perso3[0]) === null || _$Appointment26$Perso4 === void 0 ? void 0 : _$Appointment26$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : (_$Encounter19$patient = _$Encounter19.patient_id) === null || _$Encounter19$patient === void 0 ? void 0 : (_$Encounter19$patient2 = _$Encounter19$patient[0]) === null || _$Encounter19$patient2 === void 0 ? void 0 : (_$Encounter19$patient3 = _$Encounter19$patient2.name) === null || _$Encounter19$patient3 === void 0 ? void 0 : _$Encounter19$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$patient = _$Encounter20.patient_id) === null || _$Encounter20$patient === void 0 ? void 0 : (_$Encounter20$patient2 = _$Encounter20$patient[0]) === null || _$Encounter20$patient2 === void 0 ? void 0 : _$Encounter20$patient2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : _$Appointment27.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : _$Appointment28.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : _$Appointment29.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment30 = _.Appointment) === null || _$Appointment30 === void 0 ? void 0 : _$Appointment30.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : (_$Appointment31$Speci = _$Appointment31.SpecialtyID) === null || _$Appointment31$Speci === void 0 ? void 0 : _$Appointment31$Speci.map(function (spl) {
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : (_$Appointment31$Perso = _$Appointment31.PersonID) === null || _$Appointment31$Perso === void 0 ? void 0 : (_$Appointment31$Perso2 = _$Appointment31$Perso[0]) === null || _$Appointment31$Perso2 === void 0 ? void 0 : (_$Appointment31$Perso3 = _$Appointment31$Perso2.photo) === null || _$Appointment31$Perso3 === void 0 ? void 0 : (_$Appointment31$Perso4 = _$Appointment31$Perso3[0]) === null || _$Appointment31$Perso4 === void 0 ? void 0 : _$Appointment31$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : (_$Appointment32$Perso = _$Appointment32.PersonID) === null || _$Appointment32$Perso === void 0 ? void 0 : (_$Appointment32$Perso2 = _$Appointment32$Perso[0]) === null || _$Appointment32$Perso2 === void 0 ? void 0 : (_$Appointment32$Perso3 = _$Appointment32$Perso2.photo) === null || _$Appointment32$Perso3 === void 0 ? void 0 : (_$Appointment32$Perso4 = _$Appointment32$Perso3[0]) === null || _$Appointment32$Perso4 === void 0 ? void 0 : _$Appointment32$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$patient = _$Encounter22.patient_id) === null || _$Encounter22$patient === void 0 ? void 0 : (_$Encounter22$patient2 = _$Encounter22$patient[0]) === null || _$Encounter22$patient2 === void 0 ? void 0 : (_$Encounter22$patient3 = _$Encounter22$patient2.name) === null || _$Encounter22$patient3 === void 0 ? void 0 : _$Encounter22$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter23 = _.Encounter) === null || _$Encounter23 === void 0 ? void 0 : (_$Encounter23$patient = _$Encounter23.patient_id) === null || _$Encounter23$patient === void 0 ? void 0 : (_$Encounter23$patient2 = _$Encounter23$patient[0]) === null || _$Encounter23$patient2 === void 0 ? void 0 : _$Encounter23$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment33 = _.Appointment) === null || _$Appointment33 === void 0 ? void 0 : _$Appointment33.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : _$Appointment34.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : _$Appointment36.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : (_$Appointment37$Speci = _$Appointment37.SpecialtyID) === null || _$Appointment37$Speci === void 0 ? void 0 : _$Appointment37$Speci.map(function (spl) {
                 var _spl$coding4, _spl$coding4$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding4 = spl.coding) === null || _spl$coding4 === void 0 ? void 0 : (_spl$coding4$ = _spl$coding4[0]) === null || _spl$coding4$ === void 0 ? void 0 : _spl$coding4$.display;
               }).join(", "),
-              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$practit = _$Encounter21.practitioner_details) === null || _$Encounter21$practit === void 0 ? void 0 : (_$Encounter21$practit2 = _$Encounter21$practit[0]) === null || _$Encounter21$practit2 === void 0 ? void 0 : _$Encounter21$practit2.clinic,
-              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : (_$Appointment32$Perso = _$Appointment32.PersonID) === null || _$Appointment32$Perso === void 0 ? void 0 : (_$Appointment32$Perso2 = _$Appointment32$Perso[0]) === null || _$Appointment32$Perso2 === void 0 ? void 0 : _$Appointment32$Perso2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$patient = _$Encounter22.patient_id) === null || _$Encounter22$patient === void 0 ? void 0 : (_$Encounter22$patient2 = _$Encounter22$patient[0]) === null || _$Encounter22$patient2 === void 0 ? void 0 : (_$Encounter22$patient3 = _$Encounter22$patient2.telecom) === null || _$Encounter22$patient3 === void 0 ? void 0 : (_$Encounter22$patient4 = _$Encounter22$patient3[0]) === null || _$Encounter22$patient4 === void 0 ? void 0 : _$Encounter22$patient4.value),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter23 = _.Encounter) === null || _$Encounter23 === void 0 ? void 0 : _$Encounter23.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter24 = _.Encounter) === null || _$Encounter24 === void 0 ? void 0 : (_$Encounter24$status = _$Encounter24.status) === null || _$Encounter24$status === void 0 ? void 0 : _$Encounter24$status.display,
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter24 = _.Encounter) === null || _$Encounter24 === void 0 ? void 0 : (_$Encounter24$practit = _$Encounter24.practitioner_details) === null || _$Encounter24$practit === void 0 ? void 0 : (_$Encounter24$practit2 = _$Encounter24$practit[0]) === null || _$Encounter24$practit2 === void 0 ? void 0 : _$Encounter24$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : (_$Appointment38$Perso = _$Appointment38.PersonID) === null || _$Appointment38$Perso === void 0 ? void 0 : (_$Appointment38$Perso2 = _$Appointment38$Perso[0]) === null || _$Appointment38$Perso2 === void 0 ? void 0 : _$Appointment38$Perso2.birthDay,
+              type: "OP",
+              appNo: (_$Encounter$appointme4 = _ === null || _ === void 0 ? void 0 : (_$Encounter25 = _.Encounter) === null || _$Encounter25 === void 0 ? void 0 : (_$Encounter25$appoint = _$Encounter25.appointmentId) === null || _$Encounter25$appoint === void 0 ? void 0 : _$Encounter25$appoint[0]) !== null && _$Encounter$appointme4 !== void 0 ? _$Encounter$appointme4 : "",
+              data: _,
+              enId: _.Encounter.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : (_$Appointment39$Perso = _$Appointment39.PersonID) === null || _$Appointment39$Perso === void 0 ? void 0 : (_$Appointment39$Perso2 = _$Appointment39$Perso[0]) === null || _$Appointment39$Perso2 === void 0 ? void 0 : _$Appointment39$Perso2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : (_$Appointment40$Perso = _$Appointment40.PersonID) === null || _$Appointment40$Perso === void 0 ? void 0 : (_$Appointment40$Perso2 = _$Appointment40$Perso[0]) === null || _$Appointment40$Perso2 === void 0 ? void 0 : _$Appointment40$Perso2.gender,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter26 = _.Encounter) === null || _$Encounter26 === void 0 ? void 0 : (_$Encounter26$patient = _$Encounter26.patient_id) === null || _$Encounter26$patient === void 0 ? void 0 : (_$Encounter26$patient2 = _$Encounter26$patient[0]) === null || _$Encounter26$patient2 === void 0 ? void 0 : (_$Encounter26$patient3 = _$Encounter26$patient2.telecom) === null || _$Encounter26$patient3 === void 0 ? void 0 : (_$Encounter26$patient4 = _$Encounter26$patient3[0]) === null || _$Encounter26$patient4 === void 0 ? void 0 : _$Encounter26$patient4.value,
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : _$Encounter27.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter28 = _.Encounter) === null || _$Encounter28 === void 0 ? void 0 : (_$Encounter28$status = _$Encounter28.status) === null || _$Encounter28$status === void 0 ? void 0 : _$Encounter28$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -38460,24 +38498,30 @@ var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients
         case 5:
           data = _context5.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result5 = data.result) === null || _data$result5 === void 0 ? void 0 : _data$result5.map(function (_) {
-            var _$Appointment33, _$Appointment33$Perso, _$Appointment33$Perso2, _$Appointment33$Perso3, _$Appointment33$Perso4, _$Appointment34, _$Appointment34$Perso, _$Appointment34$Perso2, _$Appointment34$Perso3, _$Appointment34$Perso4, _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter25$patient3, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Appointment35, _$Appointment36, _$Appointment37, _$Appointment38, _$Appointment39, _$Appointment39$Speci, _$Encounter27, _$Encounter27$practit, _$Encounter27$practit2, _$Appointment40, _$Appointment40$Perso, _$Appointment40$Perso2, _$Encounter28, _$Encounter28$patient, _$Encounter28$patient2, _$Encounter28$patient3, _$Encounter28$patient4, _$Encounter29, _$Encounter30, _$Encounter30$status;
+            var _$Appointment41, _$Appointment41$Perso, _$Appointment41$Perso2, _$Appointment41$Perso3, _$Appointment41$Perso4, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Appointment42$Perso3, _$Appointment42$Perso4, _$Encounter29, _$Encounter29$patient, _$Encounter29$patient2, _$Encounter29$patient3, _$Encounter30, _$Encounter30$patient, _$Encounter30$patient2, _$Appointment43, _$Appointment44, _$Appointment45, _$Appointment46, _$Appointment47, _$Appointment47$Speci, _$Encounter31, _$Encounter31$practit, _$Encounter31$practit2, _$Appointment48, _$Appointment48$Perso, _$Appointment48$Perso2, _$Encounter$appointme5, _$Encounter32, _$Encounter32$appoint, _$Appointment49, _$Appointment49$Perso, _$Appointment49$Perso2, _$Appointment50, _$Appointment50$Perso, _$Appointment50$Perso2, _$Encounter33, _$Encounter33$patient, _$Encounter33$patient2, _$Encounter33$patient3, _$Encounter33$patient4, _$Encounter34, _$Encounter35, _$Encounter35$status;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment33 = _.Appointment) === null || _$Appointment33 === void 0 ? void 0 : (_$Appointment33$Perso = _$Appointment33.PersonID) === null || _$Appointment33$Perso === void 0 ? void 0 : (_$Appointment33$Perso2 = _$Appointment33$Perso[0]) === null || _$Appointment33$Perso2 === void 0 ? void 0 : (_$Appointment33$Perso3 = _$Appointment33$Perso2.photo) === null || _$Appointment33$Perso3 === void 0 ? void 0 : (_$Appointment33$Perso4 = _$Appointment33$Perso3[0]) === null || _$Appointment33$Perso4 === void 0 ? void 0 : _$Appointment33$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : (_$Appointment34$Perso = _$Appointment34.PersonID) === null || _$Appointment34$Perso === void 0 ? void 0 : (_$Appointment34$Perso2 = _$Appointment34$Perso[0]) === null || _$Appointment34$Perso2 === void 0 ? void 0 : (_$Appointment34$Perso3 = _$Appointment34$Perso2.photo) === null || _$Appointment34$Perso3 === void 0 ? void 0 : (_$Appointment34$Perso4 = _$Appointment34$Perso3[0]) === null || _$Appointment34$Perso4 === void 0 ? void 0 : _$Appointment34$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter25 = _.Encounter) === null || _$Encounter25 === void 0 ? void 0 : (_$Encounter25$patient = _$Encounter25.patient_id) === null || _$Encounter25$patient === void 0 ? void 0 : (_$Encounter25$patient2 = _$Encounter25$patient[0]) === null || _$Encounter25$patient2 === void 0 ? void 0 : (_$Encounter25$patient3 = _$Encounter25$patient2.name) === null || _$Encounter25$patient3 === void 0 ? void 0 : _$Encounter25$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter26 = _.Encounter) === null || _$Encounter26 === void 0 ? void 0 : (_$Encounter26$patient = _$Encounter26.patient_id) === null || _$Encounter26$patient === void 0 ? void 0 : (_$Encounter26$patient2 = _$Encounter26$patient[0]) === null || _$Encounter26$patient2 === void 0 ? void 0 : _$Encounter26$patient2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : _$Appointment36.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : _$Appointment37.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : _$Appointment38.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : (_$Appointment39$Speci = _$Appointment39.SpecialtyID) === null || _$Appointment39$Speci === void 0 ? void 0 : _$Appointment39$Speci.map(function (spl) {
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : (_$Appointment41$Perso = _$Appointment41.PersonID) === null || _$Appointment41$Perso === void 0 ? void 0 : (_$Appointment41$Perso2 = _$Appointment41$Perso[0]) === null || _$Appointment41$Perso2 === void 0 ? void 0 : (_$Appointment41$Perso3 = _$Appointment41$Perso2.photo) === null || _$Appointment41$Perso3 === void 0 ? void 0 : (_$Appointment41$Perso4 = _$Appointment41$Perso3[0]) === null || _$Appointment41$Perso4 === void 0 ? void 0 : _$Appointment41$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment42 = _.Appointment) === null || _$Appointment42 === void 0 ? void 0 : (_$Appointment42$Perso = _$Appointment42.PersonID) === null || _$Appointment42$Perso === void 0 ? void 0 : (_$Appointment42$Perso2 = _$Appointment42$Perso[0]) === null || _$Appointment42$Perso2 === void 0 ? void 0 : (_$Appointment42$Perso3 = _$Appointment42$Perso2.photo) === null || _$Appointment42$Perso3 === void 0 ? void 0 : (_$Appointment42$Perso4 = _$Appointment42$Perso3[0]) === null || _$Appointment42$Perso4 === void 0 ? void 0 : _$Appointment42$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$patient = _$Encounter29.patient_id) === null || _$Encounter29$patient === void 0 ? void 0 : (_$Encounter29$patient2 = _$Encounter29$patient[0]) === null || _$Encounter29$patient2 === void 0 ? void 0 : (_$Encounter29$patient3 = _$Encounter29$patient2.name) === null || _$Encounter29$patient3 === void 0 ? void 0 : _$Encounter29$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$patient = _$Encounter30.patient_id) === null || _$Encounter30$patient === void 0 ? void 0 : (_$Encounter30$patient2 = _$Encounter30$patient[0]) === null || _$Encounter30$patient2 === void 0 ? void 0 : _$Encounter30$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : _$Appointment43.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : _$Appointment44.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : _$Appointment45.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment46 = _.Appointment) === null || _$Appointment46 === void 0 ? void 0 : _$Appointment46.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment47 = _.Appointment) === null || _$Appointment47 === void 0 ? void 0 : (_$Appointment47$Speci = _$Appointment47.SpecialtyID) === null || _$Appointment47$Speci === void 0 ? void 0 : _$Appointment47$Speci.map(function (spl) {
                 var _spl$coding5, _spl$coding5$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding5 = spl.coding) === null || _spl$coding5 === void 0 ? void 0 : (_spl$coding5$ = _spl$coding5[0]) === null || _spl$coding5$ === void 0 ? void 0 : _spl$coding5$.display;
               }).join(", "),
-              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : (_$Encounter27$practit = _$Encounter27.practitioner_details) === null || _$Encounter27$practit === void 0 ? void 0 : (_$Encounter27$practit2 = _$Encounter27$practit[0]) === null || _$Encounter27$practit2 === void 0 ? void 0 : _$Encounter27$practit2.clinic,
-              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : (_$Appointment40$Perso = _$Appointment40.PersonID) === null || _$Appointment40$Perso === void 0 ? void 0 : (_$Appointment40$Perso2 = _$Appointment40$Perso[0]) === null || _$Appointment40$Perso2 === void 0 ? void 0 : _$Appointment40$Perso2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter28 = _.Encounter) === null || _$Encounter28 === void 0 ? void 0 : (_$Encounter28$patient = _$Encounter28.patient_id) === null || _$Encounter28$patient === void 0 ? void 0 : (_$Encounter28$patient2 = _$Encounter28$patient[0]) === null || _$Encounter28$patient2 === void 0 ? void 0 : (_$Encounter28$patient3 = _$Encounter28$patient2.telecom) === null || _$Encounter28$patient3 === void 0 ? void 0 : (_$Encounter28$patient4 = _$Encounter28$patient3[0]) === null || _$Encounter28$patient4 === void 0 ? void 0 : _$Encounter28$patient4.value),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : _$Encounter29.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$status = _$Encounter30.status) === null || _$Encounter30$status === void 0 ? void 0 : _$Encounter30$status.display,
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter31 = _.Encounter) === null || _$Encounter31 === void 0 ? void 0 : (_$Encounter31$practit = _$Encounter31.practitioner_details) === null || _$Encounter31$practit === void 0 ? void 0 : (_$Encounter31$practit2 = _$Encounter31$practit[0]) === null || _$Encounter31$practit2 === void 0 ? void 0 : _$Encounter31$practit2.clinic,
+              dob: _ === 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$Perso2.birthDay,
+              type: "OP",
+              appNo: (_$Encounter$appointme5 = _ === null || _ === void 0 ? void 0 : (_$Encounter32 = _.Encounter) === null || _$Encounter32 === void 0 ? void 0 : (_$Encounter32$appoint = _$Encounter32.appointmentId) === null || _$Encounter32$appoint === void 0 ? void 0 : _$Encounter32$appoint[0]) !== null && _$Encounter$appointme5 !== void 0 ? _$Encounter$appointme5 : "",
+              data: _,
+              enId: _.Encounter.id,
+              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),
+              gender: _ === 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.gender,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter33 = _.Encounter) === null || _$Encounter33 === void 0 ? void 0 : (_$Encounter33$patient = _$Encounter33.patient_id) === null || _$Encounter33$patient === void 0 ? void 0 : (_$Encounter33$patient2 = _$Encounter33$patient[0]) === null || _$Encounter33$patient2 === void 0 ? void 0 : (_$Encounter33$patient3 = _$Encounter33$patient2.telecom) === null || _$Encounter33$patient3 === void 0 ? void 0 : (_$Encounter33$patient4 = _$Encounter33$patient3[0]) === null || _$Encounter33$patient4 === void 0 ? void 0 : _$Encounter33$patient4.value,
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter34 = _.Encounter) === null || _$Encounter34 === void 0 ? void 0 : _$Encounter34.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : (_$Encounter35$status = _$Encounter35.status) === null || _$Encounter35$status === void 0 ? void 0 : _$Encounter35$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -38526,24 +38570,30 @@ var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits
         case 5:
           data = _context6.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result6 = data.result) === null || _data$result6 === void 0 ? void 0 : _data$result6.map(function (_) {
-            var _$Appointment41, _$Appointment41$Perso, _$Appointment41$Perso2, _$Appointment41$Perso3, _$Appointment41$Perso4, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Appointment42$Perso3, _$Appointment42$Perso4, _$Encounter31, _$Encounter31$patient, _$Encounter31$patient2, _$Encounter31$patient3, _$Encounter32, _$Encounter32$patient, _$Encounter32$patient2, _$Appointment43, _$Appointment44, _$Appointment45, _$Appointment46, _$Appointment47, _$Appointment47$Speci, _$Encounter33, _$Encounter33$practit, _$Encounter33$practit2, _$Appointment48, _$Appointment48$Perso, _$Appointment48$Perso2, _$Encounter34, _$Encounter34$patient, _$Encounter34$patient2, _$Encounter34$patient3, _$Encounter34$patient4, _$Encounter35, _$Encounter36, _$Encounter36$status;
+            var _$Appointment51, _$Appointment51$Perso, _$Appointment51$Perso2, _$Appointment51$Perso3, _$Appointment51$Perso4, _$Appointment52, _$Appointment52$Perso, _$Appointment52$Perso2, _$Appointment52$Perso3, _$Appointment52$Perso4, _$Encounter36, _$Encounter36$patient, _$Encounter36$patient2, _$Encounter36$patient3, _$Encounter37, _$Encounter37$patient, _$Encounter37$patient2, _$Appointment53, _$Appointment54, _$Appointment55, _$Appointment56, _$Appointment57, _$Appointment57$Speci, _$Encounter38, _$Encounter38$practit, _$Encounter38$practit2, _$Appointment58, _$Appointment58$Perso, _$Appointment58$Perso2, _$Encounter$appointme6, _$Encounter39, _$Encounter39$appoint, _$Appointment59, _$Appointment59$Perso, _$Appointment59$Perso2, _$Appointment60, _$Appointment60$Perso, _$Appointment60$Perso2, _$Encounter40, _$Encounter40$patient, _$Encounter40$patient2, _$Encounter40$patient3, _$Encounter40$patient4, _$Encounter41, _$Encounter42, _$Encounter42$status;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : (_$Appointment41$Perso = _$Appointment41.PersonID) === null || _$Appointment41$Perso === void 0 ? void 0 : (_$Appointment41$Perso2 = _$Appointment41$Perso[0]) === null || _$Appointment41$Perso2 === void 0 ? void 0 : (_$Appointment41$Perso3 = _$Appointment41$Perso2.photo) === null || _$Appointment41$Perso3 === void 0 ? void 0 : (_$Appointment41$Perso4 = _$Appointment41$Perso3[0]) === null || _$Appointment41$Perso4 === void 0 ? void 0 : _$Appointment41$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment42 = _.Appointment) === null || _$Appointment42 === void 0 ? void 0 : (_$Appointment42$Perso = _$Appointment42.PersonID) === null || _$Appointment42$Perso === void 0 ? void 0 : (_$Appointment42$Perso2 = _$Appointment42$Perso[0]) === null || _$Appointment42$Perso2 === void 0 ? void 0 : (_$Appointment42$Perso3 = _$Appointment42$Perso2.photo) === null || _$Appointment42$Perso3 === void 0 ? void 0 : (_$Appointment42$Perso4 = _$Appointment42$Perso3[0]) === null || _$Appointment42$Perso4 === void 0 ? void 0 : _$Appointment42$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter31 = _.Encounter) === null || _$Encounter31 === void 0 ? void 0 : (_$Encounter31$patient = _$Encounter31.patient_id) === null || _$Encounter31$patient === void 0 ? void 0 : (_$Encounter31$patient2 = _$Encounter31$patient[0]) === null || _$Encounter31$patient2 === void 0 ? void 0 : (_$Encounter31$patient3 = _$Encounter31$patient2.name) === null || _$Encounter31$patient3 === void 0 ? void 0 : _$Encounter31$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter32 = _.Encounter) === null || _$Encounter32 === void 0 ? void 0 : (_$Encounter32$patient = _$Encounter32.patient_id) === null || _$Encounter32$patient === void 0 ? void 0 : (_$Encounter32$patient2 = _$Encounter32$patient[0]) === null || _$Encounter32$patient2 === void 0 ? void 0 : _$Encounter32$patient2.MRN,
-              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : _$Appointment43.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : _$Appointment44.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : _$Appointment45.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment46 = _.Appointment) === null || _$Appointment46 === void 0 ? void 0 : _$Appointment46.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment47 = _.Appointment) === null || _$Appointment47 === void 0 ? void 0 : (_$Appointment47$Speci = _$Appointment47.SpecialtyID) === null || _$Appointment47$Speci === void 0 ? void 0 : _$Appointment47$Speci.map(function (spl) {
+              img: (_ === null || _ === void 0 ? void 0 : (_$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.photo) === null || _$Appointment51$Perso3 === void 0 ? void 0 : (_$Appointment51$Perso4 = _$Appointment51$Perso3[0]) === null || _$Appointment51$Perso4 === void 0 ? void 0 : _$Appointment51$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$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.photo) === null || _$Appointment52$Perso3 === void 0 ? void 0 : (_$Appointment52$Perso4 = _$Appointment52$Perso3[0]) === null || _$Appointment52$Perso4 === void 0 ? void 0 : _$Appointment52$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter36 = _.Encounter) === null || _$Encounter36 === void 0 ? void 0 : (_$Encounter36$patient = _$Encounter36.patient_id) === null || _$Encounter36$patient === void 0 ? void 0 : (_$Encounter36$patient2 = _$Encounter36$patient[0]) === null || _$Encounter36$patient2 === void 0 ? void 0 : (_$Encounter36$patient3 = _$Encounter36$patient2.name) === null || _$Encounter36$patient3 === void 0 ? void 0 : _$Encounter36$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter37 = _.Encounter) === null || _$Encounter37 === void 0 ? void 0 : (_$Encounter37$patient = _$Encounter37.patient_id) === null || _$Encounter37$patient === void 0 ? void 0 : (_$Encounter37$patient2 = _$Encounter37$patient[0]) === null || _$Encounter37$patient2 === void 0 ? void 0 : _$Encounter37$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment53 = _.Appointment) === null || _$Appointment53 === void 0 ? void 0 : _$Appointment53.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment54 = _.Appointment) === null || _$Appointment54 === void 0 ? void 0 : _$Appointment54.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment55 = _.Appointment) === null || _$Appointment55 === void 0 ? void 0 : _$Appointment55.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment56 = _.Appointment) === null || _$Appointment56 === void 0 ? void 0 : _$Appointment56.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment57 = _.Appointment) === null || _$Appointment57 === void 0 ? void 0 : (_$Appointment57$Speci = _$Appointment57.SpecialtyID) === null || _$Appointment57$Speci === void 0 ? void 0 : _$Appointment57$Speci.map(function (spl) {
                 var _spl$coding6, _spl$coding6$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding6 = spl.coding) === null || _spl$coding6 === void 0 ? void 0 : (_spl$coding6$ = _spl$coding6[0]) === null || _spl$coding6$ === void 0 ? void 0 : _spl$coding6$.display;
               }).join(", "),
-              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter33 = _.Encounter) === null || _$Encounter33 === void 0 ? void 0 : (_$Encounter33$practit = _$Encounter33.practitioner_details) === null || _$Encounter33$practit === void 0 ? void 0 : (_$Encounter33$practit2 = _$Encounter33$practit[0]) === null || _$Encounter33$practit2 === void 0 ? void 0 : _$Encounter33$practit2.clinic,
-              dob: _ === 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$Perso2.birthDay,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter34 = _.Encounter) === null || _$Encounter34 === void 0 ? void 0 : (_$Encounter34$patient = _$Encounter34.patient_id) === null || _$Encounter34$patient === void 0 ? void 0 : (_$Encounter34$patient2 = _$Encounter34$patient[0]) === null || _$Encounter34$patient2 === void 0 ? void 0 : (_$Encounter34$patient3 = _$Encounter34$patient2.telecom) === null || _$Encounter34$patient3 === void 0 ? void 0 : (_$Encounter34$patient4 = _$Encounter34$patient3[0]) === null || _$Encounter34$patient4 === void 0 ? void 0 : _$Encounter34$patient4.value),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : _$Encounter35.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter36 = _.Encounter) === null || _$Encounter36 === void 0 ? void 0 : (_$Encounter36$status = _$Encounter36.status) === null || _$Encounter36$status === void 0 ? void 0 : _$Encounter36$status.display,
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter38 = _.Encounter) === null || _$Encounter38 === void 0 ? void 0 : (_$Encounter38$practit = _$Encounter38.practitioner_details) === null || _$Encounter38$practit === void 0 ? void 0 : (_$Encounter38$practit2 = _$Encounter38$practit[0]) === null || _$Encounter38$practit2 === void 0 ? void 0 : _$Encounter38$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment58 = _.Appointment) === null || _$Appointment58 === void 0 ? void 0 : (_$Appointment58$Perso = _$Appointment58.PersonID) === null || _$Appointment58$Perso === void 0 ? void 0 : (_$Appointment58$Perso2 = _$Appointment58$Perso[0]) === null || _$Appointment58$Perso2 === void 0 ? void 0 : _$Appointment58$Perso2.birthDay,
+              type: "OP",
+              appNo: (_$Encounter$appointme6 = _ === null || _ === void 0 ? void 0 : (_$Encounter39 = _.Encounter) === null || _$Encounter39 === void 0 ? void 0 : (_$Encounter39$appoint = _$Encounter39.appointmentId) === null || _$Encounter39$appoint === void 0 ? void 0 : _$Encounter39$appoint[0]) !== null && _$Encounter$appointme6 !== void 0 ? _$Encounter$appointme6 : "",
+              data: _,
+              enId: _.Encounter.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment59 = _.Appointment) === null || _$Appointment59 === void 0 ? void 0 : (_$Appointment59$Perso = _$Appointment59.PersonID) === null || _$Appointment59$Perso === void 0 ? void 0 : (_$Appointment59$Perso2 = _$Appointment59$Perso[0]) === null || _$Appointment59$Perso2 === void 0 ? void 0 : _$Appointment59$Perso2.birthDay),
+              gender: _ === 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$Perso2.gender,
+              contact: _ === null || _ === void 0 ? void 0 : (_$Encounter40 = _.Encounter) === null || _$Encounter40 === void 0 ? void 0 : (_$Encounter40$patient = _$Encounter40.patient_id) === null || _$Encounter40$patient === void 0 ? void 0 : (_$Encounter40$patient2 = _$Encounter40$patient[0]) === null || _$Encounter40$patient2 === void 0 ? void 0 : (_$Encounter40$patient3 = _$Encounter40$patient2.telecom) === null || _$Encounter40$patient3 === void 0 ? void 0 : (_$Encounter40$patient4 = _$Encounter40$patient3[0]) === null || _$Encounter40$patient4 === void 0 ? void 0 : _$Encounter40$patient4.value,
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter41 = _.Encounter) === null || _$Encounter41 === void 0 ? void 0 : _$Encounter41.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter42 = _.Encounter) === null || _$Encounter42 === void 0 ? void 0 : (_$Encounter42$status = _$Encounter42.status) === null || _$Encounter42$status === void 0 ? void 0 : _$Encounter42$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -38593,9 +38643,9 @@ 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 _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$appointmentId$$Pers3, _$appointmentId$$Pers4, _$appointmentId2, _$appointmentId2$, _$appointmentId2$$Per, _$appointmentId2$$Per2, _$appointmentId2$$Per3, _$appointmentId2$$Per4, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$patient_id3, _$patient_id3$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$appointmentId7, _$appointmentId7$, _$visit_type, _$appointmentId8, _$appointmentId8$, _$appointmentId8$$Spe, _$practitioner_detail, _$practitioner_detail2, _$status;
+            var _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$appointmentId$$Pers3, _$appointmentId$$Pers4, _$appointmentId2, _$appointmentId2$, _$appointmentId2$$Per, _$appointmentId2$$Per2, _$appointmentId2$$Per3, _$appointmentId2$$Per4, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$patient_id3, _$patient_id3$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$appointmentId7, _$appointmentId7$, _$visit_type, _$appointmentId8, _$appointmentId8$, _$appointmentId8$$Spe, _$practitioner_detail, _$practitioner_detail2, _$status, _$appointmentId$0$id, _$appointmentId9, _$appointmentId9$, _$appointmentId10, _$appointmentId10$, _$appointmentId10$$Pe, _$appointmentId10$$Pe2, _$appointmentId11, _$appointmentId11$, _$appointmentId11$$Pe, _$appointmentId11$$Pe2, _$patient_id$0$teleco, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$patient_id5, _ref15;
 
-            return {
+            return _ref15 = {
               img: (_ === 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$$Pers3 = _$appointmentId$$Pers2.photo) === null || _$appointmentId$$Pers3 === void 0 ? void 0 : (_$appointmentId$$Pers4 = _$appointmentId$$Pers3[0]) === null || _$appointmentId$$Pers4 === void 0 ? void 0 : _$appointmentId$$Pers4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : (_$appointmentId2$$Per = _$appointmentId2$.PersonID) === null || _$appointmentId2$$Per === void 0 ? void 0 : (_$appointmentId2$$Per2 = _$appointmentId2$$Per[0]) === null || _$appointmentId2$$Per2 === void 0 ? void 0 : (_$appointmentId2$$Per3 = _$appointmentId2$$Per2.photo) === null || _$appointmentId2$$Per3 === void 0 ? void 0 : (_$appointmentId2$$Per4 = _$appointmentId2$$Per3[0]) === null || _$appointmentId2$$Per4 === void 0 ? void 0 : _$appointmentId2$$Per4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
               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) || "",
@@ -38612,8 +38662,12 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail = _.practitioner_details) === null || _$practitioner_detail === void 0 ? void 0 : (_$practitioner_detail2 = _$practitioner_detail[0]) === null || _$practitioner_detail2 === void 0 ? void 0 : _$practitioner_detail2.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display) || "",
               "View Patient": true,
-              Attend: true
-            };
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id = _ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.id) !== null && _$appointmentId$0$id !== void 0 ? _$appointmentId$0$id : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref15, "age", getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : (_$appointmentId10$$Pe = _$appointmentId10$.PersonID) === null || _$appointmentId10$$Pe === void 0 ? void 0 : (_$appointmentId10$$Pe2 = _$appointmentId10$$Pe[0]) === null || _$appointmentId10$$Pe2 === void 0 ? void 0 : _$appointmentId10$$Pe2.birthDay)), _defineProperty(_ref15, "gender", _ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : (_$appointmentId11$$Pe = _$appointmentId11$.PersonID) === null || _$appointmentId11$$Pe === void 0 ? void 0 : (_$appointmentId11$$Pe2 = _$appointmentId11$$Pe[0]) === null || _$appointmentId11$$Pe2 === void 0 ? void 0 : _$appointmentId11$$Pe2.gender), _defineProperty(_ref15, "contact", (_$patient_id$0$teleco = _ === 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$$teleco = _$patient_id4$.telecom) === null || _$patient_id4$$teleco === void 0 ? void 0 : (_$patient_id4$$teleco2 = _$patient_id4$$teleco[0]) === null || _$patient_id4$$teleco2 === void 0 ? void 0 : _$patient_id4$$teleco2.value) !== null && _$patient_id$0$teleco !== void 0 ? _$patient_id$0$teleco : ""), _defineProperty(_ref15, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : _$patient_id5.id), _ref15;
           }) : [];
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38635,7 +38689,7 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
 })));
 var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirstVisitsNurse", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
   var payload,
-      _ref16,
+      _ref17,
       rejectWithValue,
       _data$result8,
       data,
@@ -38647,7 +38701,7 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
       switch (_context8.prev = _context8.next) {
         case 0:
           payload = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
-          _ref16 = _args8.length > 1 ? _args8[1] : undefined, rejectWithValue = _ref16.rejectWithValue;
+          _ref17 = _args8.length > 1 ? _args8[1] : undefined, rejectWithValue = _ref17.rejectWithValue;
           _context8.prev = 2;
           _context8.next = 5;
           return fetchData$3({
@@ -38657,18 +38711,18 @@ 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 _$appointmentId9, _$appointmentId9$, _$appointmentId9$$Per, _$appointmentId9$$Per2, _$appointmentId9$$Per3, _$appointmentId9$$Per4, _$appointmentId10, _$appointmentId10$, _$appointmentId10$$Pe, _$appointmentId10$$Pe2, _$appointmentId10$$Pe3, _$appointmentId10$$Pe4, _$patient_id4, _$patient_id4$, _$patient_id4$$name, _$patient_id5, _$patient_id5$, _$patient_id6, _$patient_id6$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$appointmentId13, _$appointmentId13$, _$appointmentId14, _$appointmentId14$, _$appointmentId15, _$appointmentId15$, _$visit_type2, _$appointmentId16, _$appointmentId16$, _$appointmentId16$$Sp, _$practitioner_detail3, _$practitioner_detail4, _$status2;
-
-            return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : (_$appointmentId9$$Per = _$appointmentId9$.PersonID) === null || _$appointmentId9$$Per === void 0 ? void 0 : (_$appointmentId9$$Per2 = _$appointmentId9$$Per[0]) === null || _$appointmentId9$$Per2 === void 0 ? void 0 : (_$appointmentId9$$Per3 = _$appointmentId9$$Per2.photo) === null || _$appointmentId9$$Per3 === void 0 ? void 0 : (_$appointmentId9$$Per4 = _$appointmentId9$$Per3[0]) === null || _$appointmentId9$$Per4 === void 0 ? void 0 : _$appointmentId9$$Per4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : (_$appointmentId10$$Pe = _$appointmentId10$.PersonID) === null || _$appointmentId10$$Pe === void 0 ? void 0 : (_$appointmentId10$$Pe2 = _$appointmentId10$$Pe[0]) === null || _$appointmentId10$$Pe2 === void 0 ? void 0 : (_$appointmentId10$$Pe3 = _$appointmentId10$$Pe2.photo) === null || _$appointmentId10$$Pe3 === void 0 ? void 0 : (_$appointmentId10$$Pe4 = _$appointmentId10$$Pe3[0]) === null || _$appointmentId10$$Pe4 === void 0 ? void 0 : _$appointmentId10$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              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: _ === 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$.age,
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.appno) || "",
-              date: (_ === 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, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+            var _$appointmentId12, _$appointmentId12$, _$appointmentId12$$Pe, _$appointmentId12$$Pe2, _$appointmentId12$$Pe3, _$appointmentId12$$Pe4, _$appointmentId13, _$appointmentId13$, _$appointmentId13$$Pe, _$appointmentId13$$Pe2, _$appointmentId13$$Pe3, _$appointmentId13$$Pe4, _$patient_id6, _$patient_id6$, _$patient_id6$$name, _$patient_id7, _$patient_id7$, _$patient_id8, _$patient_id8$, _$appointmentId14, _$appointmentId14$, _$appointmentId15, _$appointmentId15$, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$visit_type2, _$appointmentId19, _$appointmentId19$, _$appointmentId19$$Sp, _$practitioner_detail3, _$practitioner_detail4, _$status2, _$appointmentId$0$id2, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId21$$Pe, _$appointmentId21$$Pe2, _$appointmentId22, _$appointmentId22$, _$appointmentId22$$Pe, _$appointmentId22$$Pe2, _$patient_id$0$teleco2, _$patient_id9, _$patient_id9$, _$patient_id9$$teleco, _$patient_id9$$teleco2, _$patient_id10, _ref18;
+
+            return _ref18 = {
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : (_$appointmentId12$$Pe = _$appointmentId12$.PersonID) === null || _$appointmentId12$$Pe === void 0 ? void 0 : (_$appointmentId12$$Pe2 = _$appointmentId12$$Pe[0]) === null || _$appointmentId12$$Pe2 === void 0 ? void 0 : (_$appointmentId12$$Pe3 = _$appointmentId12$$Pe2.photo) === null || _$appointmentId12$$Pe3 === void 0 ? void 0 : (_$appointmentId12$$Pe4 = _$appointmentId12$$Pe3[0]) === null || _$appointmentId12$$Pe4 === void 0 ? void 0 : _$appointmentId12$$Pe4.fileid) ? getImgUrl(_ === 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$$Pe3 = _$appointmentId13$$Pe2.photo) === null || _$appointmentId13$$Pe3 === void 0 ? void 0 : (_$appointmentId13$$Pe4 = _$appointmentId13$$Pe3[0]) === null || _$appointmentId13$$Pe4 === void 0 ? void 0 : _$appointmentId13$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === 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$$name = _$patient_id6$.name) === null || _$patient_id6$$name === void 0 ? void 0 : _$patient_id6$$name[0]) || {}),
+              mrn: (_ === 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$.alias) || "",
+              age: _ === 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$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : _$appointmentId14$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start, "hh:mm A") : "",
               visitType: (_$visit_type2 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type2 !== void 0 ? _$visit_type2 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : (_$appointmentId16$$Sp = _$appointmentId16$.SpecialtyID) === null || _$appointmentId16$$Sp === void 0 ? void 0 : _$appointmentId16$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : (_$appointmentId19$$Sp = _$appointmentId19$.SpecialtyID) === null || _$appointmentId19$$Sp === void 0 ? void 0 : _$appointmentId19$$Sp.map(function (spl) {
                 var _spl$coding8, _spl$coding8$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding8 = spl.coding) === null || _spl$coding8 === void 0 ? void 0 : (_spl$coding8$ = _spl$coding8[0]) === null || _spl$coding8$ === void 0 ? void 0 : _spl$coding8$.display;
@@ -38676,8 +38730,12 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail3 = _.practitioner_details) === null || _$practitioner_detail3 === void 0 ? void 0 : (_$practitioner_detail4 = _$practitioner_detail3[0]) === null || _$practitioner_detail4 === void 0 ? void 0 : _$practitioner_detail4.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status2 = _.status) === null || _$status2 === void 0 ? void 0 : _$status2.display) || "",
               "View Patient": true,
-              Attend: true
-            };
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id2 = _ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.id) !== null && _$appointmentId$0$id2 !== void 0 ? _$appointmentId$0$id2 : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref18, "age", getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : (_$appointmentId21$$Pe = _$appointmentId21$.PersonID) === null || _$appointmentId21$$Pe === void 0 ? void 0 : (_$appointmentId21$$Pe2 = _$appointmentId21$$Pe[0]) === null || _$appointmentId21$$Pe2 === void 0 ? void 0 : _$appointmentId21$$Pe2.birthDay)), _defineProperty(_ref18, "gender", _ === 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.gender), _defineProperty(_ref18, "contact", (_$patient_id$0$teleco2 = _ === 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$teleco2 !== void 0 ? _$patient_id$0$teleco2 : ""), _defineProperty(_ref18, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : _$patient_id10.id), _ref18;
           }) : [];
           return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38699,7 +38757,7 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
 })));
 var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPatientsNurse", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
   var payload,
-      _ref18,
+      _ref20,
       rejectWithValue,
       _data$result9,
       data,
@@ -38711,7 +38769,7 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
       switch (_context9.prev = _context9.next) {
         case 0:
           payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
-          _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue;
+          _ref20 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref20.rejectWithValue;
           _context9.prev = 2;
           _context9.next = 5;
           return fetchData$3({
@@ -38721,18 +38779,18 @@ 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 _$appointmentId17, _$appointmentId17$, _$appointmentId17$$Pe, _$appointmentId17$$Pe2, _$appointmentId17$$Pe3, _$appointmentId17$$Pe4, _$appointmentId18, _$appointmentId18$, _$appointmentId18$$Pe, _$appointmentId18$$Pe2, _$appointmentId18$$Pe3, _$appointmentId18$$Pe4, _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$patient_id9, _$patient_id9$, _$appointmentId19, _$appointmentId19$, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId22, _$appointmentId22$, _$appointmentId23, _$appointmentId23$, _$visit_type3, _$appointmentId24, _$appointmentId24$, _$appointmentId24$$Sp, _$practitioner_detail5, _$practitioner_detail6, _$status3;
-
-            return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : (_$appointmentId17$$Pe = _$appointmentId17$.PersonID) === null || _$appointmentId17$$Pe === void 0 ? void 0 : (_$appointmentId17$$Pe2 = _$appointmentId17$$Pe[0]) === null || _$appointmentId17$$Pe2 === void 0 ? void 0 : (_$appointmentId17$$Pe3 = _$appointmentId17$$Pe2.photo) === null || _$appointmentId17$$Pe3 === void 0 ? void 0 : (_$appointmentId17$$Pe4 = _$appointmentId17$$Pe3[0]) === null || _$appointmentId17$$Pe4 === void 0 ? void 0 : _$appointmentId17$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : (_$appointmentId18$$Pe = _$appointmentId18$.PersonID) === null || _$appointmentId18$$Pe === void 0 ? void 0 : (_$appointmentId18$$Pe2 = _$appointmentId18$$Pe[0]) === null || _$appointmentId18$$Pe2 === void 0 ? void 0 : (_$appointmentId18$$Pe3 = _$appointmentId18$$Pe2.photo) === null || _$appointmentId18$$Pe3 === void 0 ? void 0 : (_$appointmentId18$$Pe4 = _$appointmentId18$$Pe3[0]) === null || _$appointmentId18$$Pe4 === void 0 ? void 0 : _$appointmentId18$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
-              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: _ === 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$.age,
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : _$appointmentId19$.appno) || "",
-              date: (_ === 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") : "",
-              time: (_ === 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") : "",
+            var _$appointmentId23, _$appointmentId23$, _$appointmentId23$$Pe, _$appointmentId23$$Pe2, _$appointmentId23$$Pe3, _$appointmentId23$$Pe4, _$appointmentId24, _$appointmentId24$, _$appointmentId24$$Pe, _$appointmentId24$$Pe2, _$appointmentId24$$Pe3, _$appointmentId24$$Pe4, _$patient_id11, _$patient_id11$, _$patient_id11$$name, _$patient_id12, _$patient_id12$, _$patient_id13, _$patient_id13$, _$appointmentId25, _$appointmentId25$, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$visit_type3, _$appointmentId30, _$appointmentId30$, _$appointmentId30$$Sp, _$practitioner_detail5, _$practitioner_detail6, _$status3, _$appointmentId$0$id3, _$appointmentId31, _$appointmentId31$, _$appointmentId32, _$appointmentId32$, _$appointmentId32$$Pe, _$appointmentId32$$Pe2, _$appointmentId33, _$appointmentId33$, _$appointmentId33$$Pe, _$appointmentId33$$Pe2, _$patient_id$0$teleco3, _$patient_id14, _$patient_id14$, _$patient_id14$$telec, _$patient_id14$$telec2, _$patient_id15, _ref21;
+
+            return _ref21 = {
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : (_$appointmentId23$$Pe = _$appointmentId23$.PersonID) === null || _$appointmentId23$$Pe === void 0 ? void 0 : (_$appointmentId23$$Pe2 = _$appointmentId23$$Pe[0]) === null || _$appointmentId23$$Pe2 === void 0 ? void 0 : (_$appointmentId23$$Pe3 = _$appointmentId23$$Pe2.photo) === null || _$appointmentId23$$Pe3 === void 0 ? void 0 : (_$appointmentId23$$Pe4 = _$appointmentId23$$Pe3[0]) === null || _$appointmentId23$$Pe4 === void 0 ? void 0 : _$appointmentId23$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : (_$appointmentId24$$Pe = _$appointmentId24$.PersonID) === null || _$appointmentId24$$Pe === void 0 ? void 0 : (_$appointmentId24$$Pe2 = _$appointmentId24$$Pe[0]) === null || _$appointmentId24$$Pe2 === void 0 ? void 0 : (_$appointmentId24$$Pe3 = _$appointmentId24$$Pe2.photo) === null || _$appointmentId24$$Pe3 === void 0 ? void 0 : (_$appointmentId24$$Pe4 = _$appointmentId24$$Pe3[0]) === null || _$appointmentId24$$Pe4 === void 0 ? void 0 : _$appointmentId24$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              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$.alias) || "",
+              age: _ === 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$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : _$appointmentId25$.appno) || "",
+              date: (_ === 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") : "",
+              time: (_ === 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") : "",
               visitType: (_$visit_type3 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type3 !== void 0 ? _$visit_type3 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : (_$appointmentId24$$Sp = _$appointmentId24$.SpecialtyID) === null || _$appointmentId24$$Sp === void 0 ? void 0 : _$appointmentId24$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : (_$appointmentId30$$Sp = _$appointmentId30$.SpecialtyID) === null || _$appointmentId30$$Sp === void 0 ? void 0 : _$appointmentId30$$Sp.map(function (spl) {
                 var _spl$coding9, _spl$coding9$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding9 = spl.coding) === null || _spl$coding9 === void 0 ? void 0 : (_spl$coding9$ = _spl$coding9[0]) === null || _spl$coding9$ === void 0 ? void 0 : _spl$coding9$.display;
@@ -38740,8 +38798,12 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail5 = _.practitioner_details) === null || _$practitioner_detail5 === void 0 ? void 0 : (_$practitioner_detail6 = _$practitioner_detail5[0]) === null || _$practitioner_detail6 === void 0 ? void 0 : _$practitioner_detail6.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status3 = _.status) === null || _$status3 === void 0 ? void 0 : _$status3.display) || "",
               "View Patient": true,
-              Attend: true
-            };
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id3 = _ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : _$appointmentId31$.id) !== null && _$appointmentId$0$id3 !== void 0 ? _$appointmentId$0$id3 : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref21, "age", getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : (_$appointmentId32$$Pe = _$appointmentId32$.PersonID) === null || _$appointmentId32$$Pe === void 0 ? void 0 : (_$appointmentId32$$Pe2 = _$appointmentId32$$Pe[0]) === null || _$appointmentId32$$Pe2 === void 0 ? void 0 : _$appointmentId32$$Pe2.birthDay)), _defineProperty(_ref21, "gender", _ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : (_$appointmentId33$$Pe = _$appointmentId33$.PersonID) === null || _$appointmentId33$$Pe === void 0 ? void 0 : (_$appointmentId33$$Pe2 = _$appointmentId33$$Pe[0]) === null || _$appointmentId33$$Pe2 === void 0 ? void 0 : _$appointmentId33$$Pe2.gender), _defineProperty(_ref21, "contact", (_$patient_id$0$teleco3 = _ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : (_$patient_id14$$telec = _$patient_id14$.telecom) === null || _$patient_id14$$telec === void 0 ? void 0 : (_$patient_id14$$telec2 = _$patient_id14$$telec[0]) === null || _$patient_id14$$telec2 === void 0 ? void 0 : _$patient_id14$$telec2.value) !== null && _$patient_id$0$teleco3 !== void 0 ? _$patient_id$0$teleco3 : ""), _defineProperty(_ref21, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : _$patient_id15.id), _ref21;
           }) : [];
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38763,7 +38825,7 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
 })));
 var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOtherVisitsNurse", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
   var payload,
-      _ref20,
+      _ref23,
       rejectWithValue,
       _data$result10,
       data,
@@ -38775,7 +38837,7 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
       switch (_context10.prev = _context10.next) {
         case 0:
           payload = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
-          _ref20 = _args10.length > 1 ? _args10[1] : undefined, rejectWithValue = _ref20.rejectWithValue;
+          _ref23 = _args10.length > 1 ? _args10[1] : undefined, rejectWithValue = _ref23.rejectWithValue;
           _context10.prev = 2;
           _context10.next = 5;
           return fetchData$3({
@@ -38785,18 +38847,18 @@ 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 _$appointmentId25, _$appointmentId25$, _$appointmentId25$$Pe, _$appointmentId25$$Pe2, _$appointmentId25$$Pe3, _$appointmentId25$$Pe4, _$appointmentId26, _$appointmentId26$, _$appointmentId26$$Pe, _$appointmentId26$$Pe2, _$appointmentId26$$Pe3, _$appointmentId26$$Pe4, _$patient_id10, _$patient_id10$, _$patient_id10$$name, _$patient_id11, _$patient_id11$, _$patient_id12, _$patient_id12$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId30, _$appointmentId30$, _$appointmentId31, _$appointmentId31$, _$visit_type4, _$appointmentId32, _$appointmentId32$, _$appointmentId32$$Sp, _$practitioner_detail7, _$practitioner_detail8, _$status4;
-
-            return {
-              img: (_ === 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$$Pe3 = _$appointmentId25$$Pe2.photo) === null || _$appointmentId25$$Pe3 === void 0 ? void 0 : (_$appointmentId25$$Pe4 = _$appointmentId25$$Pe3[0]) === null || _$appointmentId25$$Pe4 === void 0 ? void 0 : _$appointmentId25$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : (_$appointmentId26$$Pe = _$appointmentId26$.PersonID) === null || _$appointmentId26$$Pe === void 0 ? void 0 : (_$appointmentId26$$Pe2 = _$appointmentId26$$Pe[0]) === null || _$appointmentId26$$Pe2 === void 0 ? void 0 : (_$appointmentId26$$Pe3 = _$appointmentId26$$Pe2.photo) === null || _$appointmentId26$$Pe3 === void 0 ? void 0 : (_$appointmentId26$$Pe4 = _$appointmentId26$$Pe3[0]) === null || _$appointmentId26$$Pe4 === void 0 ? void 0 : _$appointmentId26$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              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$.alias) || "",
-              age: _ === 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$.age,
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.appno) || "",
-              date: (_ === 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, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : _$appointmentId30$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : _$appointmentId31$.start, "hh:mm A") : "",
+            var _$appointmentId34, _$appointmentId34$, _$appointmentId34$$Pe, _$appointmentId34$$Pe2, _$appointmentId34$$Pe3, _$appointmentId34$$Pe4, _$appointmentId35, _$appointmentId35$, _$appointmentId35$$Pe, _$appointmentId35$$Pe2, _$appointmentId35$$Pe3, _$appointmentId35$$Pe4, _$patient_id16, _$patient_id16$, _$patient_id16$$name, _$patient_id17, _$patient_id17$, _$patient_id18, _$patient_id18$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId40, _$appointmentId40$, _$visit_type4, _$appointmentId41, _$appointmentId41$, _$appointmentId41$$Sp, _$practitioner_detail7, _$practitioner_detail8, _$status4, _$appointmentId$0$id4, _$appointmentId42, _$appointmentId42$, _$appointmentId43, _$appointmentId43$, _$appointmentId43$$Pe, _$appointmentId43$$Pe2, _$appointmentId44, _$appointmentId44$, _$appointmentId44$$Pe, _$appointmentId44$$Pe2, _$patient_id$0$teleco4, _$patient_id19, _$patient_id19$, _$patient_id19$$telec, _$patient_id19$$telec2, _$patient_id20, _ref24;
+
+            return _ref24 = {
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : (_$appointmentId34$$Pe = _$appointmentId34$.PersonID) === null || _$appointmentId34$$Pe === void 0 ? void 0 : (_$appointmentId34$$Pe2 = _$appointmentId34$$Pe[0]) === null || _$appointmentId34$$Pe2 === void 0 ? void 0 : (_$appointmentId34$$Pe3 = _$appointmentId34$$Pe2.photo) === null || _$appointmentId34$$Pe3 === void 0 ? void 0 : (_$appointmentId34$$Pe4 = _$appointmentId34$$Pe3[0]) === null || _$appointmentId34$$Pe4 === void 0 ? void 0 : _$appointmentId34$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : (_$appointmentId35$$Pe = _$appointmentId35$.PersonID) === null || _$appointmentId35$$Pe === void 0 ? void 0 : (_$appointmentId35$$Pe2 = _$appointmentId35$$Pe[0]) === null || _$appointmentId35$$Pe2 === void 0 ? void 0 : (_$appointmentId35$$Pe3 = _$appointmentId35$$Pe2.photo) === null || _$appointmentId35$$Pe3 === void 0 ? void 0 : (_$appointmentId35$$Pe4 = _$appointmentId35$$Pe3[0]) === null || _$appointmentId35$$Pe4 === void 0 ? void 0 : _$appointmentId35$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              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$.alias) || "",
+              age: _ === 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$.age,
+              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) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : _$appointmentId37$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : _$appointmentId39$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.start, "hh:mm A") : "",
               visitType: (_$visit_type4 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type4 !== void 0 ? _$visit_type4 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : (_$appointmentId32$$Sp = _$appointmentId32$.SpecialtyID) === null || _$appointmentId32$$Sp === void 0 ? void 0 : _$appointmentId32$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : (_$appointmentId41$$Sp = _$appointmentId41$.SpecialtyID) === null || _$appointmentId41$$Sp === void 0 ? void 0 : _$appointmentId41$$Sp.map(function (spl) {
                 var _spl$coding10, _spl$coding10$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding10 = spl.coding) === null || _spl$coding10 === void 0 ? void 0 : (_spl$coding10$ = _spl$coding10[0]) === null || _spl$coding10$ === void 0 ? void 0 : _spl$coding10$.display;
@@ -38804,8 +38866,12 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
               clinic: (_ === 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.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display) || "",
               "View Patient": true,
-              Attend: true
-            };
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id4 = _ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.id) !== null && _$appointmentId$0$id4 !== void 0 ? _$appointmentId$0$id4 : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref24, "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)), _defineProperty(_ref24, "gender", _ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : (_$appointmentId44$$Pe = _$appointmentId44$.PersonID) === null || _$appointmentId44$$Pe === void 0 ? void 0 : (_$appointmentId44$$Pe2 = _$appointmentId44$$Pe[0]) === null || _$appointmentId44$$Pe2 === void 0 ? void 0 : _$appointmentId44$$Pe2.gender), _defineProperty(_ref24, "contact", (_$patient_id$0$teleco4 = _ === 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$$telec = _$patient_id19$.telecom) === null || _$patient_id19$$telec === void 0 ? void 0 : (_$patient_id19$$telec2 = _$patient_id19$$telec[0]) === null || _$patient_id19$$telec2 === void 0 ? void 0 : _$patient_id19$$telec2.value) !== null && _$patient_id$0$teleco4 !== void 0 ? _$patient_id$0$teleco4 : ""), _defineProperty(_ref24, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id20 = _.patient_id) === null || _$patient_id20 === void 0 ? void 0 : _$patient_id20.id), _ref24;
           }) : [];
           return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38827,7 +38893,7 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
 })));
 var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getTodayVisitsNurse", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
   var payload,
-      _ref22,
+      _ref26,
       rejectWithValue,
       _data$result11,
       data,
@@ -38839,7 +38905,7 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
       switch (_context11.prev = _context11.next) {
         case 0:
           payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
-          _ref22 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref22.rejectWithValue;
+          _ref26 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
           _context11.prev = 2;
           _context11.next = 5;
           return fetchData$3({
@@ -38849,26 +38915,30 @@ 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 _$appointmentId33, _$appointmentId33$, _$appointmentId33$$Pe, _$appointmentId33$$Pe2, _$appointmentId33$$Pe3, _$appointmentId34, _$appointmentId34$, _$appointmentId34$$Pe, _$appointmentId34$$Pe2, _$appointmentId34$$Pe3, _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$patient_id15, _$patient_id15$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId39$$Sp, _$patient_id16, _$patient_id16$, _$patient_id16$$telec, _$patient_id16$$telec2, _$status5;
-
-            return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : (_$appointmentId33$$Pe = _$appointmentId33$.PersonID) === null || _$appointmentId33$$Pe === void 0 ? void 0 : (_$appointmentId33$$Pe2 = _$appointmentId33$$Pe[0]) === null || _$appointmentId33$$Pe2 === void 0 ? void 0 : (_$appointmentId33$$Pe3 = _$appointmentId33$$Pe2.photo[0]) === null || _$appointmentId33$$Pe3 === void 0 ? void 0 : _$appointmentId33$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : (_$appointmentId34$$Pe = _$appointmentId34$.PersonID) === null || _$appointmentId34$$Pe === void 0 ? void 0 : (_$appointmentId34$$Pe2 = _$appointmentId34$$Pe[0]) === null || _$appointmentId34$$Pe2 === void 0 ? void 0 : (_$appointmentId34$$Pe3 = _$appointmentId34$$Pe2.photo[0]) === null || _$appointmentId34$$Pe3 === void 0 ? void 0 : _$appointmentId34$$Pe3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
-              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: _ === 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$.age,
-              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : _$appointmentId35$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.start, "DD MMM,YYYY") : "",
-              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : _$appointmentId37$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : (_$appointmentId39$$Sp = _$appointmentId39$.SpecialtyID) === null || _$appointmentId39$$Sp === void 0 ? void 0 : _$appointmentId39$$Sp.map(function (spl) {
+            var _$appointmentId45, _$appointmentId45$, _$appointmentId45$$Pe, _$appointmentId45$$Pe2, _$appointmentId45$$Pe3, _$appointmentId46, _$appointmentId46$, _$appointmentId46$$Pe, _$appointmentId46$$Pe2, _$appointmentId46$$Pe3, _$patient_id21, _$patient_id21$, _$patient_id21$$name, _$patient_id22, _$patient_id22$, _$patient_id23, _$patient_id23$, _$appointmentId47, _$appointmentId47$, _$appointmentId48, _$appointmentId48$, _$appointmentId49, _$appointmentId49$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId51$$Sp, _$patient_id24, _$patient_id24$, _$patient_id24$$telec, _$patient_id24$$telec2, _$status5, _$appointmentId$0$id5, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId53$$Pe, _$appointmentId53$$Pe2, _$appointmentId54, _$appointmentId54$, _$appointmentId54$$Pe, _$appointmentId54$$Pe2, _$patient_id$0$teleco5, _$patient_id25, _$patient_id25$, _$patient_id25$$telec, _$patient_id25$$telec2, _$patient_id26, _ref27;
+
+            return _ref27 = {
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : (_$appointmentId45$$Pe = _$appointmentId45$.PersonID) === null || _$appointmentId45$$Pe === void 0 ? void 0 : (_$appointmentId45$$Pe2 = _$appointmentId45$$Pe[0]) === null || _$appointmentId45$$Pe2 === void 0 ? void 0 : (_$appointmentId45$$Pe3 = _$appointmentId45$$Pe2.photo[0]) === null || _$appointmentId45$$Pe3 === void 0 ? void 0 : _$appointmentId45$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : (_$appointmentId46$$Pe = _$appointmentId46$.PersonID) === null || _$appointmentId46$$Pe === void 0 ? void 0 : (_$appointmentId46$$Pe2 = _$appointmentId46$$Pe[0]) === null || _$appointmentId46$$Pe2 === void 0 ? void 0 : (_$appointmentId46$$Pe3 = _$appointmentId46$$Pe2.photo[0]) === null || _$appointmentId46$$Pe3 === void 0 ? void 0 : _$appointmentId46$$Pe3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === 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$$name = _$patient_id21$.name) === null || _$patient_id21$$name === void 0 ? void 0 : _$patient_id21$$name[0]) || {}),
+              mrn: _ === 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$.MRN,
+              age: _ === 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$.age,
+              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : _$appointmentId47$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : _$appointmentId48$.start, "DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : _$appointmentId49$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : (_$appointmentId51$$Sp = _$appointmentId51$.SpecialtyID) === null || _$appointmentId51$$Sp === void 0 ? void 0 : _$appointmentId51$$Sp.map(function (spl) {
                 var _spl$coding11, _spl$coding11$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding11 = spl.coding) === null || _spl$coding11 === void 0 ? void 0 : (_spl$coding11$ = _spl$coding11[0]) === null || _spl$coding11$ === void 0 ? void 0 : _spl$coding11$.display;
               }).join(", "),
               ward: "Ward 1",
-              contact: JSON.stringify(_ === 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$$telec = _$patient_id16$.telecom) === null || _$patient_id16$$telec === void 0 ? void 0 : (_$patient_id16$$telec2 = _$patient_id16$$telec[0]) === null || _$patient_id16$$telec2 === void 0 ? void 0 : _$patient_id16$$telec2.value),
+              contact: JSON.stringify(_ === 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),
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status5 = _.status) === null || _$status5 === void 0 ? void 0 : _$status5.display,
-              view: true
-            };
+              view: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id5 = _ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.id) !== null && _$appointmentId$0$id5 !== void 0 ? _$appointmentId$0$id5 : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref27, "age", getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : (_$appointmentId53$$Pe = _$appointmentId53$.PersonID) === null || _$appointmentId53$$Pe === void 0 ? void 0 : (_$appointmentId53$$Pe2 = _$appointmentId53$$Pe[0]) === null || _$appointmentId53$$Pe2 === void 0 ? void 0 : _$appointmentId53$$Pe2.birthDay)), _defineProperty(_ref27, "gender", _ === 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.gender), _defineProperty(_ref27, "contact", (_$patient_id$0$teleco5 = _ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : (_$patient_id25$$telec = _$patient_id25$.telecom) === null || _$patient_id25$$telec === void 0 ? void 0 : (_$patient_id25$$telec2 = _$patient_id25$$telec[0]) === null || _$patient_id25$$telec2 === void 0 ? void 0 : _$patient_id25$$telec2.value) !== null && _$patient_id$0$teleco5 !== void 0 ? _$patient_id$0$teleco5 : ""), _defineProperty(_ref27, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : _$patient_id26.id), _ref27;
           }) : [];
           return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38890,7 +38960,7 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
 })));
 var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNurse", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
-      _ref24,
+      _ref29,
       rejectWithValue,
       _data$result12,
       data,
@@ -38902,7 +38972,7 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
       switch (_context12.prev = _context12.next) {
         case 0:
           payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
-          _ref24 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref24.rejectWithValue;
+          _ref29 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref29.rejectWithValue;
           _context12.prev = 2;
           _context12.next = 5;
           return fetchData$3({
@@ -38912,18 +38982,18 @@ 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 _$appointmentId40, _$appointmentId40$, _$appointmentId40$$Pe, _$appointmentId40$$Pe2, _$appointmentId40$$Pe3, _$appointmentId40$$Pe4, _$appointmentId41, _$appointmentId41$, _$appointmentId41$$Pe, _$appointmentId41$$Pe2, _$appointmentId41$$Pe3, _$appointmentId41$$Pe4, _$patient_id17, _$patient_id17$, _$patient_id17$$name, _$patient_id18, _$patient_id18$, _$patient_id19, _$patient_id19$, _$appointmentId42, _$appointmentId42$, _$appointmentId43, _$appointmentId43$, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$visit_type5, _$appointmentId47, _$appointmentId47$, _$appointmentId47$$Sp, _$practitioner_detail9, _$practitioner_detail10, _$status6;
-
-            return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : (_$appointmentId40$$Pe = _$appointmentId40$.PersonID) === null || _$appointmentId40$$Pe === void 0 ? void 0 : (_$appointmentId40$$Pe2 = _$appointmentId40$$Pe[0]) === null || _$appointmentId40$$Pe2 === void 0 ? void 0 : (_$appointmentId40$$Pe3 = _$appointmentId40$$Pe2.photo) === null || _$appointmentId40$$Pe3 === void 0 ? void 0 : (_$appointmentId40$$Pe4 = _$appointmentId40$$Pe3[0]) === null || _$appointmentId40$$Pe4 === void 0 ? void 0 : _$appointmentId40$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : (_$appointmentId41$$Pe = _$appointmentId41$.PersonID) === null || _$appointmentId41$$Pe === void 0 ? void 0 : (_$appointmentId41$$Pe2 = _$appointmentId41$$Pe[0]) === null || _$appointmentId41$$Pe2 === void 0 ? void 0 : (_$appointmentId41$$Pe3 = _$appointmentId41$$Pe2.photo) === null || _$appointmentId41$$Pe3 === void 0 ? void 0 : (_$appointmentId41$$Pe4 = _$appointmentId41$$Pe3[0]) === null || _$appointmentId41$$Pe4 === void 0 ? void 0 : _$appointmentId41$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              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$.alias) || "",
-              age: _ === 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$.age,
-              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) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId43 = _.appointmentId) === null || _$appointmentId43 === void 0 ? void 0 : (_$appointmentId43$ = _$appointmentId43[0]) === null || _$appointmentId43$ === void 0 ? void 0 : _$appointmentId43$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start, "hh:mm A") : "",
-              visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : (_$appointmentId47$$Sp = _$appointmentId47$.SpecialtyID) === null || _$appointmentId47$$Sp === void 0 ? void 0 : _$appointmentId47$$Sp.map(function (spl) {
+            var _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Pe, _$appointmentId55$$Pe2, _$appointmentId55$$Pe3, _$appointmentId55$$Pe4, _$appointmentId56, _$appointmentId56$, _$appointmentId56$$Pe, _$appointmentId56$$Pe2, _$appointmentId56$$Pe3, _$appointmentId56$$Pe4, _$patient_id27, _$patient_id27$, _$patient_id27$$name, _$patient_id28, _$patient_id28$, _$patient_id29, _$patient_id29$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$appointmentId61, _$appointmentId61$, _$visit_type5, _$appointmentId62, _$appointmentId62$, _$appointmentId62$$Sp, _$practitioner_detail9, _$practitioner_detail10, _$status6, _$appointmentId$0$id6, _$appointmentId63, _$appointmentId63$, _$appointmentId64, _$appointmentId64$, _$appointmentId64$$Pe, _$appointmentId64$$Pe2, _$appointmentId65, _$appointmentId65$, _$appointmentId65$$Pe, _$appointmentId65$$Pe2, _$patient_id$0$teleco6, _$patient_id30, _$patient_id30$, _$patient_id30$$telec, _$patient_id30$$telec2, _$patient_id31, _ref30;
+
+            return _ref30 = {
+              img: (_ === 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$$Pe3 = _$appointmentId55$$Pe2.photo) === null || _$appointmentId55$$Pe3 === void 0 ? void 0 : (_$appointmentId55$$Pe4 = _$appointmentId55$$Pe3[0]) === null || _$appointmentId55$$Pe4 === void 0 ? void 0 : _$appointmentId55$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : (_$appointmentId56$$Pe = _$appointmentId56$.PersonID) === null || _$appointmentId56$$Pe === void 0 ? void 0 : (_$appointmentId56$$Pe2 = _$appointmentId56$$Pe[0]) === null || _$appointmentId56$$Pe2 === void 0 ? void 0 : (_$appointmentId56$$Pe3 = _$appointmentId56$$Pe2.photo) === null || _$appointmentId56$$Pe3 === void 0 ? void 0 : (_$appointmentId56$$Pe4 = _$appointmentId56$$Pe3[0]) === null || _$appointmentId56$$Pe4 === void 0 ? void 0 : _$appointmentId56$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : (_$patient_id27$$name = _$patient_id27$.name) === null || _$patient_id27$$name === void 0 ? void 0 : _$patient_id27$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : _$patient_id28$.alias) || "",
+              age: _ === 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$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.appno) || "",
+              date: (_ === 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, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : _$appointmentId61$.start, "hh:mm A") : "",
+              visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "Walk-Ins",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : (_$appointmentId62$$Sp = _$appointmentId62$.SpecialtyID) === null || _$appointmentId62$$Sp === void 0 ? void 0 : _$appointmentId62$$Sp.map(function (spl) {
                 var _spl$coding12, _spl$coding12$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding12 = spl.coding) === null || _spl$coding12 === void 0 ? void 0 : (_spl$coding12$ = _spl$coding12[0]) === null || _spl$coding12$ === void 0 ? void 0 : _spl$coding12$.display;
@@ -38931,8 +39001,12 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
               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 : (_$status6 = _.status) === null || _$status6 === void 0 ? void 0 : _$status6.display) || "",
               "View Patient": true,
-              Attend: true
-            };
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id6 = _ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : _$appointmentId63$.id) !== null && _$appointmentId$0$id6 !== void 0 ? _$appointmentId$0$id6 : '',
+              data: _,
+              enId: _.id
+            }, _defineProperty(_ref30, "age", getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId64 = _.appointmentId) === null || _$appointmentId64 === void 0 ? void 0 : (_$appointmentId64$ = _$appointmentId64[0]) === null || _$appointmentId64$ === void 0 ? void 0 : (_$appointmentId64$$Pe = _$appointmentId64$.PersonID) === null || _$appointmentId64$$Pe === void 0 ? void 0 : (_$appointmentId64$$Pe2 = _$appointmentId64$$Pe[0]) === null || _$appointmentId64$$Pe2 === void 0 ? void 0 : _$appointmentId64$$Pe2.birthDay)), _defineProperty(_ref30, "gender", _ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : (_$appointmentId65$$Pe = _$appointmentId65$.PersonID) === null || _$appointmentId65$$Pe === void 0 ? void 0 : (_$appointmentId65$$Pe2 = _$appointmentId65$$Pe[0]) === null || _$appointmentId65$$Pe2 === void 0 ? void 0 : _$appointmentId65$$Pe2.gender), _defineProperty(_ref30, "contact", (_$patient_id$0$teleco6 = _ === 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$teleco6 !== void 0 ? _$patient_id$0$teleco6 : ""), _defineProperty(_ref30, "pId", _ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : _$patient_id31.id), _ref30;
           }) : [];
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnedData
@@ -38955,7 +39029,7 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
 
 var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppointmentsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
   var payload,
-      _ref26,
+      _ref32,
       rejectWithValue,
       _data$result13,
       data,
@@ -38967,7 +39041,7 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
       switch (_context13.prev = _context13.next) {
         case 0:
           payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
-          _ref26 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
+          _ref32 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
           _context13.prev = 2;
           _context13.next = 5;
           return fetchData$3({
@@ -38977,17 +39051,17 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
         case 5:
           data = _context13.sent;
           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 _$appointmentId48, _$appointmentId48$, _$appointmentId48$$Pe, _$appointmentId48$$Pe2, _$appointmentId48$$Pe3, _$appointmentId48$$Pe4, _$appointmentId49, _$appointmentId49$, _$appointmentId49$$Pe, _$appointmentId49$$Pe2, _$appointmentId49$$Pe3, _$appointmentId49$$Pe4, _$patient_id20, _$patient_id20$, _$patient_id20$$name, _$patient_id21, _$patient_id21$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId54, _$appointmentId54$, _$visit_type6, _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Sp, _$practitioner_detail11, _$practitioner_detail12, _$status7;
+            var _$appointmentId66, _$appointmentId66$, _$appointmentId66$$Pe, _$appointmentId66$$Pe2, _$appointmentId66$$Pe3, _$appointmentId66$$Pe4, _$appointmentId67, _$appointmentId67$, _$appointmentId67$$Pe, _$appointmentId67$$Pe2, _$appointmentId67$$Pe3, _$appointmentId67$$Pe4, _$patient_id32, _$patient_id32$, _$patient_id32$$name, _$patient_id33, _$patient_id33$, _$appointmentId68, _$appointmentId68$, _$appointmentId69, _$appointmentId69$, _$appointmentId70, _$appointmentId70$, _$appointmentId71, _$appointmentId71$, _$appointmentId72, _$appointmentId72$, _$visit_type6, _$appointmentId73, _$appointmentId73$, _$appointmentId73$$Sp, _$practitioner_detail11, _$practitioner_detail12, _$status7, _$appointmentId$0$id7, _$appointmentId74, _$appointmentId74$, _$appointmentId75, _$appointmentId75$, _$appointmentId75$$Pe, _$appointmentId75$$Pe2, _$appointmentId76, _$appointmentId76$, _$appointmentId76$$Pe, _$appointmentId76$$Pe2, _$patient_id$0$teleco7, _$patient_id34, _$patient_id34$, _$patient_id34$$telec, _$patient_id34$$telec2, _$patient_id35;
 
             return {
-              img: (_ === 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$$Pe3 = _$appointmentId48$$Pe2.photo) === null || _$appointmentId48$$Pe3 === void 0 ? void 0 : (_$appointmentId48$$Pe4 = _$appointmentId48$$Pe3[0]) === null || _$appointmentId48$$Pe4 === void 0 ? void 0 : _$appointmentId48$$Pe4.fileid) ? getImgUrl(_ === 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$$Pe3 = _$appointmentId49$$Pe2.photo) === null || _$appointmentId49$$Pe3 === void 0 ? void 0 : (_$appointmentId49$$Pe4 = _$appointmentId49$$Pe3[0]) === null || _$appointmentId49$$Pe4 === void 0 ? void 0 : _$appointmentId49$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === 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$$name = _$patient_id20$.name) === null || _$patient_id20$$name === void 0 ? void 0 : _$patient_id20$$name[0]) || {}),
-              mrn: (_ === 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$.MRN) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : _$appointmentId51$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : _$appointmentId53$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId54 = _.appointmentId) === null || _$appointmentId54 === void 0 ? void 0 : (_$appointmentId54$ = _$appointmentId54[0]) === null || _$appointmentId54$ === void 0 ? void 0 : _$appointmentId54$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : (_$appointmentId66$$Pe = _$appointmentId66$.PersonID) === null || _$appointmentId66$$Pe === void 0 ? void 0 : (_$appointmentId66$$Pe2 = _$appointmentId66$$Pe[0]) === null || _$appointmentId66$$Pe2 === void 0 ? void 0 : (_$appointmentId66$$Pe3 = _$appointmentId66$$Pe2.photo) === null || _$appointmentId66$$Pe3 === void 0 ? void 0 : (_$appointmentId66$$Pe4 = _$appointmentId66$$Pe3[0]) === null || _$appointmentId66$$Pe4 === void 0 ? void 0 : _$appointmentId66$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId67 = _.appointmentId) === null || _$appointmentId67 === void 0 ? void 0 : (_$appointmentId67$ = _$appointmentId67[0]) === null || _$appointmentId67$ === void 0 ? void 0 : (_$appointmentId67$$Pe = _$appointmentId67$.PersonID) === null || _$appointmentId67$$Pe === void 0 ? void 0 : (_$appointmentId67$$Pe2 = _$appointmentId67$$Pe[0]) === null || _$appointmentId67$$Pe2 === void 0 ? void 0 : (_$appointmentId67$$Pe3 = _$appointmentId67$$Pe2.photo) === null || _$appointmentId67$$Pe3 === void 0 ? void 0 : (_$appointmentId67$$Pe4 = _$appointmentId67$$Pe3[0]) === null || _$appointmentId67$$Pe4 === void 0 ? void 0 : _$appointmentId67$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id32 = _.patient_id) === null || _$patient_id32 === void 0 ? void 0 : (_$patient_id32$ = _$patient_id32[0]) === null || _$patient_id32$ === void 0 ? void 0 : (_$patient_id32$$name = _$patient_id32$.name) === null || _$patient_id32$$name === void 0 ? void 0 : _$patient_id32$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id33 = _.patient_id) === null || _$patient_id33 === void 0 ? void 0 : (_$patient_id33$ = _$patient_id33[0]) === null || _$patient_id33$ === void 0 ? void 0 : _$patient_id33$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId68 = _.appointmentId) === null || _$appointmentId68 === void 0 ? void 0 : (_$appointmentId68$ = _$appointmentId68[0]) === null || _$appointmentId68$ === void 0 ? void 0 : _$appointmentId68$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId69 = _.appointmentId) === null || _$appointmentId69 === void 0 ? void 0 : (_$appointmentId69$ = _$appointmentId69[0]) === null || _$appointmentId69$ === void 0 ? void 0 : _$appointmentId69$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId70 = _.appointmentId) === null || _$appointmentId70 === void 0 ? void 0 : (_$appointmentId70$ = _$appointmentId70[0]) === null || _$appointmentId70$ === void 0 ? void 0 : _$appointmentId70$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId71 = _.appointmentId) === null || _$appointmentId71 === void 0 ? void 0 : (_$appointmentId71$ = _$appointmentId71[0]) === null || _$appointmentId71$ === void 0 ? void 0 : _$appointmentId71$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId72 = _.appointmentId) === null || _$appointmentId72 === void 0 ? void 0 : (_$appointmentId72$ = _$appointmentId72[0]) === null || _$appointmentId72$ === void 0 ? void 0 : _$appointmentId72$.start, "hh:mm A") : "",
               visitType: (_$visit_type6 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type6 !== void 0 ? _$visit_type6 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : (_$appointmentId55$$Sp = _$appointmentId55$.SpecialtyID) === null || _$appointmentId55$$Sp === void 0 ? void 0 : _$appointmentId55$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId73 = _.appointmentId) === null || _$appointmentId73 === void 0 ? void 0 : (_$appointmentId73$ = _$appointmentId73[0]) === null || _$appointmentId73$ === void 0 ? void 0 : (_$appointmentId73$$Sp = _$appointmentId73$.SpecialtyID) === null || _$appointmentId73$$Sp === void 0 ? void 0 : _$appointmentId73$$Sp.map(function (spl) {
                 var _spl$coding13, _spl$coding13$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding13 = spl.coding) === null || _spl$coding13 === void 0 ? void 0 : (_spl$coding13$ = _spl$coding13[0]) === null || _spl$coding13$ === void 0 ? void 0 : _spl$coding13$.display;
@@ -38995,7 +39069,15 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail11 = _.practitioner_details) === null || _$practitioner_detail11 === void 0 ? void 0 : (_$practitioner_detail12 = _$practitioner_detail11[0]) === null || _$practitioner_detail12 === void 0 ? void 0 : _$practitioner_detail12.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status7 = _.status) === null || _$status7 === void 0 ? void 0 : _$status7.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id7 = _ === null || _ === void 0 ? void 0 : (_$appointmentId74 = _.appointmentId) === null || _$appointmentId74 === void 0 ? void 0 : (_$appointmentId74$ = _$appointmentId74[0]) === null || _$appointmentId74$ === void 0 ? void 0 : _$appointmentId74$.id) !== null && _$appointmentId$0$id7 !== void 0 ? _$appointmentId$0$id7 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId75 = _.appointmentId) === null || _$appointmentId75 === void 0 ? void 0 : (_$appointmentId75$ = _$appointmentId75[0]) === null || _$appointmentId75$ === void 0 ? void 0 : (_$appointmentId75$$Pe = _$appointmentId75$.PersonID) === null || _$appointmentId75$$Pe === void 0 ? void 0 : (_$appointmentId75$$Pe2 = _$appointmentId75$$Pe[0]) === null || _$appointmentId75$$Pe2 === void 0 ? void 0 : _$appointmentId75$$Pe2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId76 = _.appointmentId) === null || _$appointmentId76 === void 0 ? void 0 : (_$appointmentId76$ = _$appointmentId76[0]) === null || _$appointmentId76$ === void 0 ? void 0 : (_$appointmentId76$$Pe = _$appointmentId76$.PersonID) === null || _$appointmentId76$$Pe === void 0 ? void 0 : (_$appointmentId76$$Pe2 = _$appointmentId76$$Pe[0]) === null || _$appointmentId76$$Pe2 === void 0 ? void 0 : _$appointmentId76$$Pe2.gender,
+              contact: (_$patient_id$0$teleco7 = _ === null || _ === void 0 ? void 0 : (_$patient_id34 = _.patient_id) === null || _$patient_id34 === void 0 ? void 0 : (_$patient_id34$ = _$patient_id34[0]) === null || _$patient_id34$ === void 0 ? void 0 : (_$patient_id34$$telec = _$patient_id34$.telecom) === null || _$patient_id34$$telec === void 0 ? void 0 : (_$patient_id34$$telec2 = _$patient_id34$$telec[0]) === null || _$patient_id34$$telec2 === void 0 ? void 0 : _$patient_id34$$telec2.value) !== null && _$patient_id$0$teleco7 !== void 0 ? _$patient_id$0$teleco7 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : _$patient_id35.id
             };
           }) : [];
           return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39018,7 +39100,7 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
 })));
 var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirstVisitsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
-      _ref28,
+      _ref34,
       rejectWithValue,
       _data$result14,
       data,
@@ -39030,7 +39112,7 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
       switch (_context14.prev = _context14.next) {
         case 0:
           payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-          _ref28 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref28.rejectWithValue;
+          _ref34 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
           _context14.prev = 2;
           _context14.next = 5;
           return fetchData$3({
@@ -39040,17 +39122,17 @@ 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 _$appointmentId56, _$appointmentId56$, _$appointmentId56$$Pe, _$appointmentId56$$Pe2, _$appointmentId56$$Pe3, _$appointmentId56$$Pe4, _$appointmentId57, _$appointmentId57$, _$appointmentId57$$Pe, _$appointmentId57$$Pe2, _$appointmentId57$$Pe3, _$appointmentId57$$Pe4, _$patient_id22, _$patient_id22$, _$patient_id22$$name, _$patient_id23, _$patient_id23$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$appointmentId61, _$appointmentId61$, _$appointmentId62, _$appointmentId62$, _$visit_type7, _$appointmentId63, _$appointmentId63$, _$appointmentId63$$Sp, _$practitioner_detail13, _$practitioner_detail14, _$status8;
+            var _$appointmentId77, _$appointmentId77$, _$appointmentId77$$Pe, _$appointmentId77$$Pe2, _$appointmentId77$$Pe3, _$appointmentId77$$Pe4, _$appointmentId78, _$appointmentId78$, _$appointmentId78$$Pe, _$appointmentId78$$Pe2, _$appointmentId78$$Pe3, _$appointmentId78$$Pe4, _$patient_id36, _$patient_id36$, _$patient_id36$$name, _$patient_id37, _$patient_id37$, _$appointmentId79, _$appointmentId79$, _$appointmentId80, _$appointmentId80$, _$appointmentId81, _$appointmentId81$, _$appointmentId82, _$appointmentId82$, _$appointmentId83, _$appointmentId83$, _$visit_type7, _$appointmentId84, _$appointmentId84$, _$appointmentId84$$Sp, _$practitioner_detail13, _$practitioner_detail14, _$status8, _$appointmentId$0$id8, _$appointmentId85, _$appointmentId85$, _$appointmentId86, _$appointmentId86$, _$appointmentId86$$Pe, _$appointmentId86$$Pe2, _$appointmentId87, _$appointmentId87$, _$appointmentId87$$Pe, _$appointmentId87$$Pe2, _$patient_id$0$teleco8, _$patient_id38, _$patient_id38$, _$patient_id38$$telec, _$patient_id38$$telec2, _$patient_id39;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : (_$appointmentId56$$Pe = _$appointmentId56$.PersonID) === null || _$appointmentId56$$Pe === void 0 ? void 0 : (_$appointmentId56$$Pe2 = _$appointmentId56$$Pe[0]) === null || _$appointmentId56$$Pe2 === void 0 ? void 0 : (_$appointmentId56$$Pe3 = _$appointmentId56$$Pe2.photo) === null || _$appointmentId56$$Pe3 === void 0 ? void 0 : (_$appointmentId56$$Pe4 = _$appointmentId56$$Pe3[0]) === null || _$appointmentId56$$Pe4 === void 0 ? void 0 : _$appointmentId56$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : (_$appointmentId57$$Pe = _$appointmentId57$.PersonID) === null || _$appointmentId57$$Pe === void 0 ? void 0 : (_$appointmentId57$$Pe2 = _$appointmentId57$$Pe[0]) === null || _$appointmentId57$$Pe2 === void 0 ? void 0 : (_$appointmentId57$$Pe3 = _$appointmentId57$$Pe2.photo) === null || _$appointmentId57$$Pe3 === void 0 ? void 0 : (_$appointmentId57$$Pe4 = _$appointmentId57$$Pe3[0]) === null || _$appointmentId57$$Pe4 === void 0 ? void 0 : _$appointmentId57$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              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) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : _$appointmentId61$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : _$appointmentId62$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId77 = _.appointmentId) === null || _$appointmentId77 === void 0 ? void 0 : (_$appointmentId77$ = _$appointmentId77[0]) === null || _$appointmentId77$ === void 0 ? void 0 : (_$appointmentId77$$Pe = _$appointmentId77$.PersonID) === null || _$appointmentId77$$Pe === void 0 ? void 0 : (_$appointmentId77$$Pe2 = _$appointmentId77$$Pe[0]) === null || _$appointmentId77$$Pe2 === void 0 ? void 0 : (_$appointmentId77$$Pe3 = _$appointmentId77$$Pe2.photo) === null || _$appointmentId77$$Pe3 === void 0 ? void 0 : (_$appointmentId77$$Pe4 = _$appointmentId77$$Pe3[0]) === null || _$appointmentId77$$Pe4 === void 0 ? void 0 : _$appointmentId77$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId78 = _.appointmentId) === null || _$appointmentId78 === void 0 ? void 0 : (_$appointmentId78$ = _$appointmentId78[0]) === null || _$appointmentId78$ === void 0 ? void 0 : (_$appointmentId78$$Pe = _$appointmentId78$.PersonID) === null || _$appointmentId78$$Pe === void 0 ? void 0 : (_$appointmentId78$$Pe2 = _$appointmentId78$$Pe[0]) === null || _$appointmentId78$$Pe2 === void 0 ? void 0 : (_$appointmentId78$$Pe3 = _$appointmentId78$$Pe2.photo) === null || _$appointmentId78$$Pe3 === void 0 ? void 0 : (_$appointmentId78$$Pe4 = _$appointmentId78$$Pe3[0]) === null || _$appointmentId78$$Pe4 === void 0 ? void 0 : _$appointmentId78$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id36 = _.patient_id) === null || _$patient_id36 === void 0 ? void 0 : (_$patient_id36$ = _$patient_id36[0]) === null || _$patient_id36$ === void 0 ? void 0 : (_$patient_id36$$name = _$patient_id36$.name) === null || _$patient_id36$$name === void 0 ? void 0 : _$patient_id36$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id37 = _.patient_id) === null || _$patient_id37 === void 0 ? void 0 : (_$patient_id37$ = _$patient_id37[0]) === null || _$patient_id37$ === void 0 ? void 0 : _$patient_id37$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId79 = _.appointmentId) === null || _$appointmentId79 === void 0 ? void 0 : (_$appointmentId79$ = _$appointmentId79[0]) === null || _$appointmentId79$ === void 0 ? void 0 : _$appointmentId79$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId80 = _.appointmentId) === null || _$appointmentId80 === void 0 ? void 0 : (_$appointmentId80$ = _$appointmentId80[0]) === null || _$appointmentId80$ === void 0 ? void 0 : _$appointmentId80$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId81 = _.appointmentId) === null || _$appointmentId81 === void 0 ? void 0 : (_$appointmentId81$ = _$appointmentId81[0]) === null || _$appointmentId81$ === void 0 ? void 0 : _$appointmentId81$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId82 = _.appointmentId) === null || _$appointmentId82 === void 0 ? void 0 : (_$appointmentId82$ = _$appointmentId82[0]) === null || _$appointmentId82$ === void 0 ? void 0 : _$appointmentId82$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId83 = _.appointmentId) === null || _$appointmentId83 === void 0 ? void 0 : (_$appointmentId83$ = _$appointmentId83[0]) === null || _$appointmentId83$ === void 0 ? void 0 : _$appointmentId83$.start, "hh:mm A") : "",
               visitType: (_$visit_type7 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type7 !== void 0 ? _$visit_type7 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : (_$appointmentId63$$Sp = _$appointmentId63$.SpecialtyID) === null || _$appointmentId63$$Sp === void 0 ? void 0 : _$appointmentId63$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId84 = _.appointmentId) === null || _$appointmentId84 === void 0 ? void 0 : (_$appointmentId84$ = _$appointmentId84[0]) === null || _$appointmentId84$ === void 0 ? void 0 : (_$appointmentId84$$Sp = _$appointmentId84$.SpecialtyID) === null || _$appointmentId84$$Sp === void 0 ? void 0 : _$appointmentId84$$Sp.map(function (spl) {
                 var _spl$coding14, _spl$coding14$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding14 = spl.coding) === null || _spl$coding14 === void 0 ? void 0 : (_spl$coding14$ = _spl$coding14[0]) === null || _spl$coding14$ === void 0 ? void 0 : _spl$coding14$.display;
@@ -39058,7 +39140,15 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail13 = _.practitioner_details) === null || _$practitioner_detail13 === void 0 ? void 0 : (_$practitioner_detail14 = _$practitioner_detail13[0]) === null || _$practitioner_detail14 === void 0 ? void 0 : _$practitioner_detail14.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status8 = _.status) === null || _$status8 === void 0 ? void 0 : _$status8.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id8 = _ === null || _ === void 0 ? void 0 : (_$appointmentId85 = _.appointmentId) === null || _$appointmentId85 === void 0 ? void 0 : (_$appointmentId85$ = _$appointmentId85[0]) === null || _$appointmentId85$ === void 0 ? void 0 : _$appointmentId85$.id) !== null && _$appointmentId$0$id8 !== void 0 ? _$appointmentId$0$id8 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId86 = _.appointmentId) === null || _$appointmentId86 === void 0 ? void 0 : (_$appointmentId86$ = _$appointmentId86[0]) === null || _$appointmentId86$ === void 0 ? void 0 : (_$appointmentId86$$Pe = _$appointmentId86$.PersonID) === null || _$appointmentId86$$Pe === void 0 ? void 0 : (_$appointmentId86$$Pe2 = _$appointmentId86$$Pe[0]) === null || _$appointmentId86$$Pe2 === void 0 ? void 0 : _$appointmentId86$$Pe2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId87 = _.appointmentId) === null || _$appointmentId87 === void 0 ? void 0 : (_$appointmentId87$ = _$appointmentId87[0]) === null || _$appointmentId87$ === void 0 ? void 0 : (_$appointmentId87$$Pe = _$appointmentId87$.PersonID) === null || _$appointmentId87$$Pe === void 0 ? void 0 : (_$appointmentId87$$Pe2 = _$appointmentId87$$Pe[0]) === null || _$appointmentId87$$Pe2 === void 0 ? void 0 : _$appointmentId87$$Pe2.gender,
+              contact: (_$patient_id$0$teleco8 = _ === null || _ === void 0 ? void 0 : (_$patient_id38 = _.patient_id) === null || _$patient_id38 === void 0 ? void 0 : (_$patient_id38$ = _$patient_id38[0]) === null || _$patient_id38$ === void 0 ? void 0 : (_$patient_id38$$telec = _$patient_id38$.telecom) === null || _$patient_id38$$telec === void 0 ? void 0 : (_$patient_id38$$telec2 = _$patient_id38$$telec[0]) === null || _$patient_id38$$telec2 === void 0 ? void 0 : _$patient_id38$$telec2.value) !== null && _$patient_id$0$teleco8 !== void 0 ? _$patient_id$0$teleco8 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id39 = _.patient_id) === null || _$patient_id39 === void 0 ? void 0 : _$patient_id39.id
             };
           }) : [];
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39081,7 +39171,7 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
 })));
 var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewPatientsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
   var payload,
-      _ref30,
+      _ref36,
       rejectWithValue,
       _data$result15,
       data,
@@ -39093,7 +39183,7 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
       switch (_context15.prev = _context15.next) {
         case 0:
           payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
-          _ref30 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref30.rejectWithValue;
+          _ref36 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
           _context15.prev = 2;
           _context15.next = 5;
           return fetchData$3({
@@ -39103,17 +39193,17 @@ 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 _$appointmentId64, _$appointmentId64$, _$appointmentId64$$Pe, _$appointmentId64$$Pe2, _$appointmentId64$$Pe3, _$appointmentId64$$Pe4, _$appointmentId65, _$appointmentId65$, _$appointmentId65$$Pe, _$appointmentId65$$Pe2, _$appointmentId65$$Pe3, _$appointmentId65$$Pe4, _$patient_id24, _$patient_id24$, _$patient_id24$$name, _$patient_id25, _$patient_id25$, _$appointmentId66, _$appointmentId66$, _$appointmentId67, _$appointmentId67$, _$appointmentId68, _$appointmentId68$, _$appointmentId69, _$appointmentId69$, _$appointmentId70, _$appointmentId70$, _$visit_type8, _$appointmentId71, _$appointmentId71$, _$appointmentId71$$Sp, _$practitioner_detail15, _$practitioner_detail16, _$status9;
+            var _$appointmentId88, _$appointmentId88$, _$appointmentId88$$Pe, _$appointmentId88$$Pe2, _$appointmentId88$$Pe3, _$appointmentId88$$Pe4, _$appointmentId89, _$appointmentId89$, _$appointmentId89$$Pe, _$appointmentId89$$Pe2, _$appointmentId89$$Pe3, _$appointmentId89$$Pe4, _$patient_id40, _$patient_id40$, _$patient_id40$$name, _$patient_id41, _$patient_id41$, _$appointmentId90, _$appointmentId90$, _$appointmentId91, _$appointmentId91$, _$appointmentId92, _$appointmentId92$, _$appointmentId93, _$appointmentId93$, _$appointmentId94, _$appointmentId94$, _$visit_type8, _$appointmentId95, _$appointmentId95$, _$appointmentId95$$Sp, _$practitioner_detail15, _$practitioner_detail16, _$status9, _$appointmentId$0$id9, _$appointmentId96, _$appointmentId96$, _$appointmentId97, _$appointmentId97$, _$appointmentId97$$Pe, _$appointmentId97$$Pe2, _$appointmentId98, _$appointmentId98$, _$appointmentId98$$Pe, _$appointmentId98$$Pe2, _$patient_id$0$teleco9, _$patient_id42, _$patient_id42$, _$patient_id42$$telec, _$patient_id42$$telec2, _$patient_id43;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId64 = _.appointmentId) === null || _$appointmentId64 === void 0 ? void 0 : (_$appointmentId64$ = _$appointmentId64[0]) === null || _$appointmentId64$ === void 0 ? void 0 : (_$appointmentId64$$Pe = _$appointmentId64$.PersonID) === null || _$appointmentId64$$Pe === void 0 ? void 0 : (_$appointmentId64$$Pe2 = _$appointmentId64$$Pe[0]) === null || _$appointmentId64$$Pe2 === void 0 ? void 0 : (_$appointmentId64$$Pe3 = _$appointmentId64$$Pe2.photo) === null || _$appointmentId64$$Pe3 === void 0 ? void 0 : (_$appointmentId64$$Pe4 = _$appointmentId64$$Pe3[0]) === null || _$appointmentId64$$Pe4 === void 0 ? void 0 : _$appointmentId64$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : (_$appointmentId65$$Pe = _$appointmentId65$.PersonID) === null || _$appointmentId65$$Pe === void 0 ? void 0 : (_$appointmentId65$$Pe2 = _$appointmentId65$$Pe[0]) === null || _$appointmentId65$$Pe2 === void 0 ? void 0 : (_$appointmentId65$$Pe3 = _$appointmentId65$$Pe2.photo) === null || _$appointmentId65$$Pe3 === void 0 ? void 0 : (_$appointmentId65$$Pe4 = _$appointmentId65$$Pe3[0]) === null || _$appointmentId65$$Pe4 === void 0 ? void 0 : _$appointmentId65$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === 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$$name = _$patient_id24$.name) === null || _$patient_id24$$name === void 0 ? void 0 : _$patient_id24$$name[0]) || {}),
-              mrn: (_ === 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$.MRN) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : _$appointmentId66$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId67 = _.appointmentId) === null || _$appointmentId67 === void 0 ? void 0 : (_$appointmentId67$ = _$appointmentId67[0]) === null || _$appointmentId67$ === void 0 ? void 0 : _$appointmentId67$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId68 = _.appointmentId) === null || _$appointmentId68 === void 0 ? void 0 : (_$appointmentId68$ = _$appointmentId68[0]) === null || _$appointmentId68$ === void 0 ? void 0 : _$appointmentId68$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId69 = _.appointmentId) === null || _$appointmentId69 === void 0 ? void 0 : (_$appointmentId69$ = _$appointmentId69[0]) === null || _$appointmentId69$ === void 0 ? void 0 : _$appointmentId69$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId70 = _.appointmentId) === null || _$appointmentId70 === void 0 ? void 0 : (_$appointmentId70$ = _$appointmentId70[0]) === null || _$appointmentId70$ === void 0 ? void 0 : _$appointmentId70$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId88 = _.appointmentId) === null || _$appointmentId88 === void 0 ? void 0 : (_$appointmentId88$ = _$appointmentId88[0]) === null || _$appointmentId88$ === void 0 ? void 0 : (_$appointmentId88$$Pe = _$appointmentId88$.PersonID) === null || _$appointmentId88$$Pe === void 0 ? void 0 : (_$appointmentId88$$Pe2 = _$appointmentId88$$Pe[0]) === null || _$appointmentId88$$Pe2 === void 0 ? void 0 : (_$appointmentId88$$Pe3 = _$appointmentId88$$Pe2.photo) === null || _$appointmentId88$$Pe3 === void 0 ? void 0 : (_$appointmentId88$$Pe4 = _$appointmentId88$$Pe3[0]) === null || _$appointmentId88$$Pe4 === void 0 ? void 0 : _$appointmentId88$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId89 = _.appointmentId) === null || _$appointmentId89 === void 0 ? void 0 : (_$appointmentId89$ = _$appointmentId89[0]) === null || _$appointmentId89$ === void 0 ? void 0 : (_$appointmentId89$$Pe = _$appointmentId89$.PersonID) === null || _$appointmentId89$$Pe === void 0 ? void 0 : (_$appointmentId89$$Pe2 = _$appointmentId89$$Pe[0]) === null || _$appointmentId89$$Pe2 === void 0 ? void 0 : (_$appointmentId89$$Pe3 = _$appointmentId89$$Pe2.photo) === null || _$appointmentId89$$Pe3 === void 0 ? void 0 : (_$appointmentId89$$Pe4 = _$appointmentId89$$Pe3[0]) === null || _$appointmentId89$$Pe4 === void 0 ? void 0 : _$appointmentId89$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id40 = _.patient_id) === null || _$patient_id40 === void 0 ? void 0 : (_$patient_id40$ = _$patient_id40[0]) === null || _$patient_id40$ === void 0 ? void 0 : (_$patient_id40$$name = _$patient_id40$.name) === null || _$patient_id40$$name === void 0 ? void 0 : _$patient_id40$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id41 = _.patient_id) === null || _$patient_id41 === void 0 ? void 0 : (_$patient_id41$ = _$patient_id41[0]) === null || _$patient_id41$ === void 0 ? void 0 : _$patient_id41$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId90 = _.appointmentId) === null || _$appointmentId90 === void 0 ? void 0 : (_$appointmentId90$ = _$appointmentId90[0]) === null || _$appointmentId90$ === void 0 ? void 0 : _$appointmentId90$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId91 = _.appointmentId) === null || _$appointmentId91 === void 0 ? void 0 : (_$appointmentId91$ = _$appointmentId91[0]) === null || _$appointmentId91$ === void 0 ? void 0 : _$appointmentId91$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId92 = _.appointmentId) === null || _$appointmentId92 === void 0 ? void 0 : (_$appointmentId92$ = _$appointmentId92[0]) === null || _$appointmentId92$ === void 0 ? void 0 : _$appointmentId92$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId93 = _.appointmentId) === null || _$appointmentId93 === void 0 ? void 0 : (_$appointmentId93$ = _$appointmentId93[0]) === null || _$appointmentId93$ === void 0 ? void 0 : _$appointmentId93$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId94 = _.appointmentId) === null || _$appointmentId94 === void 0 ? void 0 : (_$appointmentId94$ = _$appointmentId94[0]) === null || _$appointmentId94$ === void 0 ? void 0 : _$appointmentId94$.start, "hh:mm A") : "",
               visitType: (_$visit_type8 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type8 !== void 0 ? _$visit_type8 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId71 = _.appointmentId) === null || _$appointmentId71 === void 0 ? void 0 : (_$appointmentId71$ = _$appointmentId71[0]) === null || _$appointmentId71$ === void 0 ? void 0 : (_$appointmentId71$$Sp = _$appointmentId71$.SpecialtyID) === null || _$appointmentId71$$Sp === void 0 ? void 0 : _$appointmentId71$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId95 = _.appointmentId) === null || _$appointmentId95 === void 0 ? void 0 : (_$appointmentId95$ = _$appointmentId95[0]) === null || _$appointmentId95$ === void 0 ? void 0 : (_$appointmentId95$$Sp = _$appointmentId95$.SpecialtyID) === null || _$appointmentId95$$Sp === void 0 ? void 0 : _$appointmentId95$$Sp.map(function (spl) {
                 var _spl$coding15, _spl$coding15$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding15 = spl.coding) === null || _spl$coding15 === void 0 ? void 0 : (_spl$coding15$ = _spl$coding15[0]) === null || _spl$coding15$ === void 0 ? void 0 : _spl$coding15$.display;
@@ -39121,7 +39211,15 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail15 = _.practitioner_details) === null || _$practitioner_detail15 === void 0 ? void 0 : (_$practitioner_detail16 = _$practitioner_detail15[0]) === null || _$practitioner_detail16 === void 0 ? void 0 : _$practitioner_detail16.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status9 = _.status) === null || _$status9 === void 0 ? void 0 : _$status9.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id9 = _ === null || _ === void 0 ? void 0 : (_$appointmentId96 = _.appointmentId) === null || _$appointmentId96 === void 0 ? void 0 : (_$appointmentId96$ = _$appointmentId96[0]) === null || _$appointmentId96$ === void 0 ? void 0 : _$appointmentId96$.id) !== null && _$appointmentId$0$id9 !== void 0 ? _$appointmentId$0$id9 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId97 = _.appointmentId) === null || _$appointmentId97 === void 0 ? void 0 : (_$appointmentId97$ = _$appointmentId97[0]) === null || _$appointmentId97$ === void 0 ? void 0 : (_$appointmentId97$$Pe = _$appointmentId97$.PersonID) === null || _$appointmentId97$$Pe === void 0 ? void 0 : (_$appointmentId97$$Pe2 = _$appointmentId97$$Pe[0]) === null || _$appointmentId97$$Pe2 === void 0 ? void 0 : _$appointmentId97$$Pe2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId98 = _.appointmentId) === null || _$appointmentId98 === void 0 ? void 0 : (_$appointmentId98$ = _$appointmentId98[0]) === null || _$appointmentId98$ === void 0 ? void 0 : (_$appointmentId98$$Pe = _$appointmentId98$.PersonID) === null || _$appointmentId98$$Pe === void 0 ? void 0 : (_$appointmentId98$$Pe2 = _$appointmentId98$$Pe[0]) === null || _$appointmentId98$$Pe2 === void 0 ? void 0 : _$appointmentId98$$Pe2.gender,
+              contact: (_$patient_id$0$teleco9 = _ === null || _ === void 0 ? void 0 : (_$patient_id42 = _.patient_id) === null || _$patient_id42 === void 0 ? void 0 : (_$patient_id42$ = _$patient_id42[0]) === null || _$patient_id42$ === void 0 ? void 0 : (_$patient_id42$$telec = _$patient_id42$.telecom) === null || _$patient_id42$$telec === void 0 ? void 0 : (_$patient_id42$$telec2 = _$patient_id42$$telec[0]) === null || _$patient_id42$$telec2 === void 0 ? void 0 : _$patient_id42$$telec2.value) !== null && _$patient_id$0$teleco9 !== void 0 ? _$patient_id$0$teleco9 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id43 = _.patient_id) === null || _$patient_id43 === void 0 ? void 0 : _$patient_id43.id
             };
           }) : [];
           return _context15.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39144,7 +39242,7 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
 })));
 var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOtherVisitsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
   var payload,
-      _ref32,
+      _ref38,
       rejectWithValue,
       _data$result16,
       data,
@@ -39156,7 +39254,7 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
       switch (_context16.prev = _context16.next) {
         case 0:
           payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
-          _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
+          _ref38 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
           _context16.prev = 2;
           _context16.next = 5;
           return fetchData$3({
@@ -39166,17 +39264,17 @@ 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 _$appointmentId72, _$appointmentId72$, _$appointmentId72$$Pe, _$appointmentId72$$Pe2, _$appointmentId72$$Pe3, _$appointmentId72$$Pe4, _$appointmentId73, _$appointmentId73$, _$appointmentId73$$Pe, _$appointmentId73$$Pe2, _$appointmentId73$$Pe3, _$appointmentId73$$Pe4, _$patient_id26, _$patient_id26$, _$patient_id26$$name, _$patient_id27, _$patient_id27$, _$appointmentId74, _$appointmentId74$, _$appointmentId75, _$appointmentId75$, _$appointmentId76, _$appointmentId76$, _$appointmentId77, _$appointmentId77$, _$appointmentId78, _$appointmentId78$, _$visit_type9, _$appointmentId79, _$appointmentId79$, _$appointmentId79$$Sp, _$practitioner_detail17, _$practitioner_detail18, _$status10;
+            var _$appointmentId99, _$appointmentId99$, _$appointmentId99$$Pe, _$appointmentId99$$Pe2, _$appointmentId99$$Pe3, _$appointmentId99$$Pe4, _$appointmentId100, _$appointmentId100$, _$appointmentId100$$P, _$appointmentId100$$P2, _$appointmentId100$$P3, _$appointmentId100$$P4, _$patient_id44, _$patient_id44$, _$patient_id44$$name, _$patient_id45, _$patient_id45$, _$appointmentId101, _$appointmentId101$, _$appointmentId102, _$appointmentId102$, _$appointmentId103, _$appointmentId103$, _$appointmentId104, _$appointmentId104$, _$appointmentId105, _$appointmentId105$, _$visit_type9, _$appointmentId106, _$appointmentId106$, _$appointmentId106$$S, _$practitioner_detail17, _$practitioner_detail18, _$status10, _$appointmentId$0$id10, _$appointmentId107, _$appointmentId107$, _$appointmentId108, _$appointmentId108$, _$appointmentId108$$P, _$appointmentId108$$P2, _$appointmentId109, _$appointmentId109$, _$appointmentId109$$P, _$appointmentId109$$P2, _$patient_id$0$teleco10, _$patient_id46, _$patient_id46$, _$patient_id46$$telec, _$patient_id46$$telec2, _$patient_id47;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId72 = _.appointmentId) === null || _$appointmentId72 === void 0 ? void 0 : (_$appointmentId72$ = _$appointmentId72[0]) === null || _$appointmentId72$ === void 0 ? void 0 : (_$appointmentId72$$Pe = _$appointmentId72$.PersonID) === null || _$appointmentId72$$Pe === void 0 ? void 0 : (_$appointmentId72$$Pe2 = _$appointmentId72$$Pe[0]) === null || _$appointmentId72$$Pe2 === void 0 ? void 0 : (_$appointmentId72$$Pe3 = _$appointmentId72$$Pe2.photo) === null || _$appointmentId72$$Pe3 === void 0 ? void 0 : (_$appointmentId72$$Pe4 = _$appointmentId72$$Pe3[0]) === null || _$appointmentId72$$Pe4 === void 0 ? void 0 : _$appointmentId72$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId73 = _.appointmentId) === null || _$appointmentId73 === void 0 ? void 0 : (_$appointmentId73$ = _$appointmentId73[0]) === null || _$appointmentId73$ === void 0 ? void 0 : (_$appointmentId73$$Pe = _$appointmentId73$.PersonID) === null || _$appointmentId73$$Pe === void 0 ? void 0 : (_$appointmentId73$$Pe2 = _$appointmentId73$$Pe[0]) === null || _$appointmentId73$$Pe2 === void 0 ? void 0 : (_$appointmentId73$$Pe3 = _$appointmentId73$$Pe2.photo) === null || _$appointmentId73$$Pe3 === void 0 ? void 0 : (_$appointmentId73$$Pe4 = _$appointmentId73$$Pe3[0]) === null || _$appointmentId73$$Pe4 === void 0 ? void 0 : _$appointmentId73$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === 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$$name = _$patient_id26$.name) === null || _$patient_id26$$name === void 0 ? void 0 : _$patient_id26$$name[0]) || {}),
-              mrn: (_ === 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$.MRN) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId74 = _.appointmentId) === null || _$appointmentId74 === void 0 ? void 0 : (_$appointmentId74$ = _$appointmentId74[0]) === null || _$appointmentId74$ === void 0 ? void 0 : _$appointmentId74$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId75 = _.appointmentId) === null || _$appointmentId75 === void 0 ? void 0 : (_$appointmentId75$ = _$appointmentId75[0]) === null || _$appointmentId75$ === void 0 ? void 0 : _$appointmentId75$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId76 = _.appointmentId) === null || _$appointmentId76 === void 0 ? void 0 : (_$appointmentId76$ = _$appointmentId76[0]) === null || _$appointmentId76$ === void 0 ? void 0 : _$appointmentId76$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId77 = _.appointmentId) === null || _$appointmentId77 === void 0 ? void 0 : (_$appointmentId77$ = _$appointmentId77[0]) === null || _$appointmentId77$ === void 0 ? void 0 : _$appointmentId77$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId78 = _.appointmentId) === null || _$appointmentId78 === void 0 ? void 0 : (_$appointmentId78$ = _$appointmentId78[0]) === null || _$appointmentId78$ === void 0 ? void 0 : _$appointmentId78$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId99 = _.appointmentId) === null || _$appointmentId99 === void 0 ? void 0 : (_$appointmentId99$ = _$appointmentId99[0]) === null || _$appointmentId99$ === void 0 ? void 0 : (_$appointmentId99$$Pe = _$appointmentId99$.PersonID) === null || _$appointmentId99$$Pe === void 0 ? void 0 : (_$appointmentId99$$Pe2 = _$appointmentId99$$Pe[0]) === null || _$appointmentId99$$Pe2 === void 0 ? void 0 : (_$appointmentId99$$Pe3 = _$appointmentId99$$Pe2.photo) === null || _$appointmentId99$$Pe3 === void 0 ? void 0 : (_$appointmentId99$$Pe4 = _$appointmentId99$$Pe3[0]) === null || _$appointmentId99$$Pe4 === void 0 ? void 0 : _$appointmentId99$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId100 = _.appointmentId) === null || _$appointmentId100 === void 0 ? void 0 : (_$appointmentId100$ = _$appointmentId100[0]) === null || _$appointmentId100$ === void 0 ? void 0 : (_$appointmentId100$$P = _$appointmentId100$.PersonID) === null || _$appointmentId100$$P === void 0 ? void 0 : (_$appointmentId100$$P2 = _$appointmentId100$$P[0]) === null || _$appointmentId100$$P2 === void 0 ? void 0 : (_$appointmentId100$$P3 = _$appointmentId100$$P2.photo) === null || _$appointmentId100$$P3 === void 0 ? void 0 : (_$appointmentId100$$P4 = _$appointmentId100$$P3[0]) === null || _$appointmentId100$$P4 === void 0 ? void 0 : _$appointmentId100$$P4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id44 = _.patient_id) === null || _$patient_id44 === void 0 ? void 0 : (_$patient_id44$ = _$patient_id44[0]) === null || _$patient_id44$ === void 0 ? void 0 : (_$patient_id44$$name = _$patient_id44$.name) === null || _$patient_id44$$name === void 0 ? void 0 : _$patient_id44$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id45 = _.patient_id) === null || _$patient_id45 === void 0 ? void 0 : (_$patient_id45$ = _$patient_id45[0]) === null || _$patient_id45$ === void 0 ? void 0 : _$patient_id45$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId101 = _.appointmentId) === null || _$appointmentId101 === void 0 ? void 0 : (_$appointmentId101$ = _$appointmentId101[0]) === null || _$appointmentId101$ === void 0 ? void 0 : _$appointmentId101$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId102 = _.appointmentId) === null || _$appointmentId102 === void 0 ? void 0 : (_$appointmentId102$ = _$appointmentId102[0]) === null || _$appointmentId102$ === void 0 ? void 0 : _$appointmentId102$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId103 = _.appointmentId) === null || _$appointmentId103 === void 0 ? void 0 : (_$appointmentId103$ = _$appointmentId103[0]) === null || _$appointmentId103$ === void 0 ? void 0 : _$appointmentId103$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId104 = _.appointmentId) === null || _$appointmentId104 === void 0 ? void 0 : (_$appointmentId104$ = _$appointmentId104[0]) === null || _$appointmentId104$ === void 0 ? void 0 : _$appointmentId104$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId105 = _.appointmentId) === null || _$appointmentId105 === void 0 ? void 0 : (_$appointmentId105$ = _$appointmentId105[0]) === null || _$appointmentId105$ === void 0 ? void 0 : _$appointmentId105$.start, "hh:mm A") : "",
               visitType: (_$visit_type9 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type9 !== void 0 ? _$visit_type9 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId79 = _.appointmentId) === null || _$appointmentId79 === void 0 ? void 0 : (_$appointmentId79$ = _$appointmentId79[0]) === null || _$appointmentId79$ === void 0 ? void 0 : (_$appointmentId79$$Sp = _$appointmentId79$.SpecialtyID) === null || _$appointmentId79$$Sp === void 0 ? void 0 : _$appointmentId79$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId106 = _.appointmentId) === null || _$appointmentId106 === void 0 ? void 0 : (_$appointmentId106$ = _$appointmentId106[0]) === null || _$appointmentId106$ === void 0 ? void 0 : (_$appointmentId106$$S = _$appointmentId106$.SpecialtyID) === null || _$appointmentId106$$S === void 0 ? void 0 : _$appointmentId106$$S.map(function (spl) {
                 var _spl$coding16, _spl$coding16$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding16 = spl.coding) === null || _spl$coding16 === void 0 ? void 0 : (_spl$coding16$ = _spl$coding16[0]) === null || _spl$coding16$ === void 0 ? void 0 : _spl$coding16$.display;
@@ -39184,7 +39282,15 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
               clinic: (_ === 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.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status10 = _.status) === null || _$status10 === void 0 ? void 0 : _$status10.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id10 = _ === null || _ === void 0 ? void 0 : (_$appointmentId107 = _.appointmentId) === null || _$appointmentId107 === void 0 ? void 0 : (_$appointmentId107$ = _$appointmentId107[0]) === null || _$appointmentId107$ === void 0 ? void 0 : _$appointmentId107$.id) !== null && _$appointmentId$0$id10 !== void 0 ? _$appointmentId$0$id10 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId108 = _.appointmentId) === null || _$appointmentId108 === void 0 ? void 0 : (_$appointmentId108$ = _$appointmentId108[0]) === null || _$appointmentId108$ === void 0 ? void 0 : (_$appointmentId108$$P = _$appointmentId108$.PersonID) === null || _$appointmentId108$$P === void 0 ? void 0 : (_$appointmentId108$$P2 = _$appointmentId108$$P[0]) === null || _$appointmentId108$$P2 === void 0 ? void 0 : _$appointmentId108$$P2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId109 = _.appointmentId) === null || _$appointmentId109 === void 0 ? void 0 : (_$appointmentId109$ = _$appointmentId109[0]) === null || _$appointmentId109$ === void 0 ? void 0 : (_$appointmentId109$$P = _$appointmentId109$.PersonID) === null || _$appointmentId109$$P === void 0 ? void 0 : (_$appointmentId109$$P2 = _$appointmentId109$$P[0]) === null || _$appointmentId109$$P2 === void 0 ? void 0 : _$appointmentId109$$P2.gender,
+              contact: (_$patient_id$0$teleco10 = _ === null || _ === void 0 ? void 0 : (_$patient_id46 = _.patient_id) === null || _$patient_id46 === void 0 ? void 0 : (_$patient_id46$ = _$patient_id46[0]) === null || _$patient_id46$ === void 0 ? void 0 : (_$patient_id46$$telec = _$patient_id46$.telecom) === null || _$patient_id46$$telec === void 0 ? void 0 : (_$patient_id46$$telec2 = _$patient_id46$$telec[0]) === null || _$patient_id46$$telec2 === void 0 ? void 0 : _$patient_id46$$telec2.value) !== null && _$patient_id$0$teleco10 !== void 0 ? _$patient_id$0$teleco10 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id47 = _.patient_id) === null || _$patient_id47 === void 0 ? void 0 : _$patient_id47.id
             };
           }) : [];
           return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39207,7 +39313,7 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
 })));
 var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getTodayVisitsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
   var payload,
-      _ref34,
+      _ref40,
       rejectWithValue,
       _data$result17,
       data,
@@ -39219,7 +39325,7 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
       switch (_context17.prev = _context17.next) {
         case 0:
           payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
-          _ref34 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
+          _ref40 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref40.rejectWithValue;
           _context17.prev = 2;
           _context17.next = 5;
           return fetchData$3({
@@ -39229,17 +39335,17 @@ 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 _$appointmentId80, _$appointmentId80$, _$appointmentId80$$Pe, _$appointmentId80$$Pe2, _$appointmentId80$$Pe3, _$appointmentId80$$Pe4, _$appointmentId81, _$appointmentId81$, _$appointmentId81$$Pe, _$appointmentId81$$Pe2, _$appointmentId81$$Pe3, _$appointmentId81$$Pe4, _$patient_id28, _$patient_id28$, _$patient_id28$$name, _$patient_id29, _$patient_id29$, _$appointmentId82, _$appointmentId82$, _$appointmentId83, _$appointmentId83$, _$appointmentId84, _$appointmentId84$, _$appointmentId85, _$appointmentId85$, _$appointmentId86, _$appointmentId86$, _$visit_type10, _$appointmentId87, _$appointmentId87$, _$appointmentId87$$Sp, _$practitioner_detail19, _$practitioner_detail20, _$status11;
+            var _$appointmentId110, _$appointmentId110$, _$appointmentId110$$P, _$appointmentId110$$P2, _$appointmentId110$$P3, _$appointmentId110$$P4, _$appointmentId111, _$appointmentId111$, _$appointmentId111$$P, _$appointmentId111$$P2, _$appointmentId111$$P3, _$appointmentId111$$P4, _$patient_id48, _$patient_id48$, _$patient_id48$$name, _$patient_id49, _$patient_id49$, _$appointmentId112, _$appointmentId112$, _$appointmentId113, _$appointmentId113$, _$appointmentId114, _$appointmentId114$, _$appointmentId115, _$appointmentId115$, _$appointmentId116, _$appointmentId116$, _$visit_type10, _$appointmentId117, _$appointmentId117$, _$appointmentId117$$S, _$practitioner_detail19, _$practitioner_detail20, _$status11, _$appointmentId$0$id11, _$appointmentId118, _$appointmentId118$, _$appointmentId119, _$appointmentId119$, _$appointmentId119$$P, _$appointmentId119$$P2, _$appointmentId120, _$appointmentId120$, _$appointmentId120$$P, _$appointmentId120$$P2, _$patient_id$0$teleco11, _$patient_id50, _$patient_id50$, _$patient_id50$$telec, _$patient_id50$$telec2, _$patient_id51;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId80 = _.appointmentId) === null || _$appointmentId80 === void 0 ? void 0 : (_$appointmentId80$ = _$appointmentId80[0]) === null || _$appointmentId80$ === void 0 ? void 0 : (_$appointmentId80$$Pe = _$appointmentId80$.PersonID) === null || _$appointmentId80$$Pe === void 0 ? void 0 : (_$appointmentId80$$Pe2 = _$appointmentId80$$Pe[0]) === null || _$appointmentId80$$Pe2 === void 0 ? void 0 : (_$appointmentId80$$Pe3 = _$appointmentId80$$Pe2.photo) === null || _$appointmentId80$$Pe3 === void 0 ? void 0 : (_$appointmentId80$$Pe4 = _$appointmentId80$$Pe3[0]) === null || _$appointmentId80$$Pe4 === void 0 ? void 0 : _$appointmentId80$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId81 = _.appointmentId) === null || _$appointmentId81 === void 0 ? void 0 : (_$appointmentId81$ = _$appointmentId81[0]) === null || _$appointmentId81$ === void 0 ? void 0 : (_$appointmentId81$$Pe = _$appointmentId81$.PersonID) === null || _$appointmentId81$$Pe === void 0 ? void 0 : (_$appointmentId81$$Pe2 = _$appointmentId81$$Pe[0]) === null || _$appointmentId81$$Pe2 === void 0 ? void 0 : (_$appointmentId81$$Pe3 = _$appointmentId81$$Pe2.photo) === null || _$appointmentId81$$Pe3 === void 0 ? void 0 : (_$appointmentId81$$Pe4 = _$appointmentId81$$Pe3[0]) === null || _$appointmentId81$$Pe4 === void 0 ? void 0 : _$appointmentId81$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : (_$patient_id28$$name = _$patient_id28$.name) === null || _$patient_id28$$name === void 0 ? void 0 : _$patient_id28$$name[0]) || {}),
-              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) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId82 = _.appointmentId) === null || _$appointmentId82 === void 0 ? void 0 : (_$appointmentId82$ = _$appointmentId82[0]) === null || _$appointmentId82$ === void 0 ? void 0 : _$appointmentId82$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId83 = _.appointmentId) === null || _$appointmentId83 === void 0 ? void 0 : (_$appointmentId83$ = _$appointmentId83[0]) === null || _$appointmentId83$ === void 0 ? void 0 : _$appointmentId83$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId84 = _.appointmentId) === null || _$appointmentId84 === void 0 ? void 0 : (_$appointmentId84$ = _$appointmentId84[0]) === null || _$appointmentId84$ === void 0 ? void 0 : _$appointmentId84$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId85 = _.appointmentId) === null || _$appointmentId85 === void 0 ? void 0 : (_$appointmentId85$ = _$appointmentId85[0]) === null || _$appointmentId85$ === void 0 ? void 0 : _$appointmentId85$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId86 = _.appointmentId) === null || _$appointmentId86 === void 0 ? void 0 : (_$appointmentId86$ = _$appointmentId86[0]) === null || _$appointmentId86$ === void 0 ? void 0 : _$appointmentId86$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId110 = _.appointmentId) === null || _$appointmentId110 === void 0 ? void 0 : (_$appointmentId110$ = _$appointmentId110[0]) === null || _$appointmentId110$ === void 0 ? void 0 : (_$appointmentId110$$P = _$appointmentId110$.PersonID) === null || _$appointmentId110$$P === void 0 ? void 0 : (_$appointmentId110$$P2 = _$appointmentId110$$P[0]) === null || _$appointmentId110$$P2 === void 0 ? void 0 : (_$appointmentId110$$P3 = _$appointmentId110$$P2.photo) === null || _$appointmentId110$$P3 === void 0 ? void 0 : (_$appointmentId110$$P4 = _$appointmentId110$$P3[0]) === null || _$appointmentId110$$P4 === void 0 ? void 0 : _$appointmentId110$$P4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId111 = _.appointmentId) === null || _$appointmentId111 === void 0 ? void 0 : (_$appointmentId111$ = _$appointmentId111[0]) === null || _$appointmentId111$ === void 0 ? void 0 : (_$appointmentId111$$P = _$appointmentId111$.PersonID) === null || _$appointmentId111$$P === void 0 ? void 0 : (_$appointmentId111$$P2 = _$appointmentId111$$P[0]) === null || _$appointmentId111$$P2 === void 0 ? void 0 : (_$appointmentId111$$P3 = _$appointmentId111$$P2.photo) === null || _$appointmentId111$$P3 === void 0 ? void 0 : (_$appointmentId111$$P4 = _$appointmentId111$$P3[0]) === null || _$appointmentId111$$P4 === void 0 ? void 0 : _$appointmentId111$$P4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id48 = _.patient_id) === null || _$patient_id48 === void 0 ? void 0 : (_$patient_id48$ = _$patient_id48[0]) === null || _$patient_id48$ === void 0 ? void 0 : (_$patient_id48$$name = _$patient_id48$.name) === null || _$patient_id48$$name === void 0 ? void 0 : _$patient_id48$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id49 = _.patient_id) === null || _$patient_id49 === void 0 ? void 0 : (_$patient_id49$ = _$patient_id49[0]) === null || _$patient_id49$ === void 0 ? void 0 : _$patient_id49$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId112 = _.appointmentId) === null || _$appointmentId112 === void 0 ? void 0 : (_$appointmentId112$ = _$appointmentId112[0]) === null || _$appointmentId112$ === void 0 ? void 0 : _$appointmentId112$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId113 = _.appointmentId) === null || _$appointmentId113 === void 0 ? void 0 : (_$appointmentId113$ = _$appointmentId113[0]) === null || _$appointmentId113$ === void 0 ? void 0 : _$appointmentId113$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId114 = _.appointmentId) === null || _$appointmentId114 === void 0 ? void 0 : (_$appointmentId114$ = _$appointmentId114[0]) === null || _$appointmentId114$ === void 0 ? void 0 : _$appointmentId114$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId115 = _.appointmentId) === null || _$appointmentId115 === void 0 ? void 0 : (_$appointmentId115$ = _$appointmentId115[0]) === null || _$appointmentId115$ === void 0 ? void 0 : _$appointmentId115$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId116 = _.appointmentId) === null || _$appointmentId116 === void 0 ? void 0 : (_$appointmentId116$ = _$appointmentId116[0]) === null || _$appointmentId116$ === void 0 ? void 0 : _$appointmentId116$.start, "hh:mm A") : "",
               visitType: (_$visit_type10 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type10 !== void 0 ? _$visit_type10 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId87 = _.appointmentId) === null || _$appointmentId87 === void 0 ? void 0 : (_$appointmentId87$ = _$appointmentId87[0]) === null || _$appointmentId87$ === void 0 ? void 0 : (_$appointmentId87$$Sp = _$appointmentId87$.SpecialtyID) === null || _$appointmentId87$$Sp === void 0 ? void 0 : _$appointmentId87$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId117 = _.appointmentId) === null || _$appointmentId117 === void 0 ? void 0 : (_$appointmentId117$ = _$appointmentId117[0]) === null || _$appointmentId117$ === void 0 ? void 0 : (_$appointmentId117$$S = _$appointmentId117$.SpecialtyID) === null || _$appointmentId117$$S === void 0 ? void 0 : _$appointmentId117$$S.map(function (spl) {
                 var _spl$coding17, _spl$coding17$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding17 = spl.coding) === null || _spl$coding17 === void 0 ? void 0 : (_spl$coding17$ = _spl$coding17[0]) === null || _spl$coding17$ === void 0 ? void 0 : _spl$coding17$.display;
@@ -39247,7 +39353,15 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
               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 : (_$status11 = _.status) === null || _$status11 === void 0 ? void 0 : _$status11.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id11 = _ === null || _ === void 0 ? void 0 : (_$appointmentId118 = _.appointmentId) === null || _$appointmentId118 === void 0 ? void 0 : (_$appointmentId118$ = _$appointmentId118[0]) === null || _$appointmentId118$ === void 0 ? void 0 : _$appointmentId118$.id) !== null && _$appointmentId$0$id11 !== void 0 ? _$appointmentId$0$id11 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId119 = _.appointmentId) === null || _$appointmentId119 === void 0 ? void 0 : (_$appointmentId119$ = _$appointmentId119[0]) === null || _$appointmentId119$ === void 0 ? void 0 : (_$appointmentId119$$P = _$appointmentId119$.PersonID) === null || _$appointmentId119$$P === void 0 ? void 0 : (_$appointmentId119$$P2 = _$appointmentId119$$P[0]) === null || _$appointmentId119$$P2 === void 0 ? void 0 : _$appointmentId119$$P2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId120 = _.appointmentId) === null || _$appointmentId120 === void 0 ? void 0 : (_$appointmentId120$ = _$appointmentId120[0]) === null || _$appointmentId120$ === void 0 ? void 0 : (_$appointmentId120$$P = _$appointmentId120$.PersonID) === null || _$appointmentId120$$P === void 0 ? void 0 : (_$appointmentId120$$P2 = _$appointmentId120$$P[0]) === null || _$appointmentId120$$P2 === void 0 ? void 0 : _$appointmentId120$$P2.gender,
+              contact: (_$patient_id$0$teleco11 = _ === null || _ === void 0 ? void 0 : (_$patient_id50 = _.patient_id) === null || _$patient_id50 === void 0 ? void 0 : (_$patient_id50$ = _$patient_id50[0]) === null || _$patient_id50$ === void 0 ? void 0 : (_$patient_id50$$telec = _$patient_id50$.telecom) === null || _$patient_id50$$telec === void 0 ? void 0 : (_$patient_id50$$telec2 = _$patient_id50$$telec[0]) === null || _$patient_id50$$telec2 === void 0 ? void 0 : _$patient_id50$$telec2.value) !== null && _$patient_id$0$teleco11 !== void 0 ? _$patient_id$0$teleco11 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id51 = _.patient_id) === null || _$patient_id51 === void 0 ? void 0 : _$patient_id51.id
             };
           }) : [];
           return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39270,7 +39384,7 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
 })));
 var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsDoctor", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
   var payload,
-      _ref36,
+      _ref42,
       rejectWithValue,
       _data$result18,
       data,
@@ -39282,7 +39396,7 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
       switch (_context18.prev = _context18.next) {
         case 0:
           payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
-          _ref36 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
+          _ref42 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref42.rejectWithValue;
           _context18.prev = 2;
           _context18.next = 5;
           return fetchData$3({
@@ -39292,17 +39406,17 @@ 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 _$appointmentId88, _$appointmentId88$, _$appointmentId88$$Pe, _$appointmentId88$$Pe2, _$appointmentId88$$Pe3, _$appointmentId88$$Pe4, _$appointmentId89, _$appointmentId89$, _$appointmentId89$$Pe, _$appointmentId89$$Pe2, _$appointmentId89$$Pe3, _$appointmentId89$$Pe4, _$patient_id30, _$patient_id30$, _$patient_id30$$name, _$patient_id31, _$patient_id31$, _$appointmentId90, _$appointmentId90$, _$appointmentId91, _$appointmentId91$, _$appointmentId92, _$appointmentId92$, _$appointmentId93, _$appointmentId93$, _$appointmentId94, _$appointmentId94$, _$visit_type11, _$appointmentId95, _$appointmentId95$, _$appointmentId95$$Sp, _$practitioner_detail21, _$practitioner_detail22, _$status12;
+            var _$appointmentId121, _$appointmentId121$, _$appointmentId121$$P, _$appointmentId121$$P2, _$appointmentId121$$P3, _$appointmentId121$$P4, _$appointmentId122, _$appointmentId122$, _$appointmentId122$$P, _$appointmentId122$$P2, _$appointmentId122$$P3, _$appointmentId122$$P4, _$patient_id52, _$patient_id52$, _$patient_id52$$name, _$patient_id53, _$patient_id53$, _$appointmentId123, _$appointmentId123$, _$appointmentId124, _$appointmentId124$, _$appointmentId125, _$appointmentId125$, _$appointmentId126, _$appointmentId126$, _$appointmentId127, _$appointmentId127$, _$visit_type11, _$appointmentId128, _$appointmentId128$, _$appointmentId128$$S, _$practitioner_detail21, _$practitioner_detail22, _$status12, _$appointmentId$0$id12, _$appointmentId129, _$appointmentId129$, _$appointmentId130, _$appointmentId130$, _$appointmentId130$$P, _$appointmentId130$$P2, _$appointmentId131, _$appointmentId131$, _$appointmentId131$$P, _$appointmentId131$$P2, _$patient_id$0$teleco12, _$patient_id54, _$patient_id54$, _$patient_id54$$telec, _$patient_id54$$telec2, _$patient_id55;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId88 = _.appointmentId) === null || _$appointmentId88 === void 0 ? void 0 : (_$appointmentId88$ = _$appointmentId88[0]) === null || _$appointmentId88$ === void 0 ? void 0 : (_$appointmentId88$$Pe = _$appointmentId88$.PersonID) === null || _$appointmentId88$$Pe === void 0 ? void 0 : (_$appointmentId88$$Pe2 = _$appointmentId88$$Pe[0]) === null || _$appointmentId88$$Pe2 === void 0 ? void 0 : (_$appointmentId88$$Pe3 = _$appointmentId88$$Pe2.photo) === null || _$appointmentId88$$Pe3 === void 0 ? void 0 : (_$appointmentId88$$Pe4 = _$appointmentId88$$Pe3[0]) === null || _$appointmentId88$$Pe4 === void 0 ? void 0 : _$appointmentId88$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId89 = _.appointmentId) === null || _$appointmentId89 === void 0 ? void 0 : (_$appointmentId89$ = _$appointmentId89[0]) === null || _$appointmentId89$ === void 0 ? void 0 : (_$appointmentId89$$Pe = _$appointmentId89$.PersonID) === null || _$appointmentId89$$Pe === void 0 ? void 0 : (_$appointmentId89$$Pe2 = _$appointmentId89$$Pe[0]) === null || _$appointmentId89$$Pe2 === void 0 ? void 0 : (_$appointmentId89$$Pe3 = _$appointmentId89$$Pe2.photo) === null || _$appointmentId89$$Pe3 === void 0 ? void 0 : (_$appointmentId89$$Pe4 = _$appointmentId89$$Pe3[0]) === null || _$appointmentId89$$Pe4 === void 0 ? void 0 : _$appointmentId89$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === 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$$name = _$patient_id30$.name) === null || _$patient_id30$$name === void 0 ? void 0 : _$patient_id30$$name[0]) || {}),
-              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : _$patient_id31$.MRN) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId90 = _.appointmentId) === null || _$appointmentId90 === void 0 ? void 0 : (_$appointmentId90$ = _$appointmentId90[0]) === null || _$appointmentId90$ === void 0 ? void 0 : _$appointmentId90$.appno) || "",
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId91 = _.appointmentId) === null || _$appointmentId91 === void 0 ? void 0 : (_$appointmentId91$ = _$appointmentId91[0]) === null || _$appointmentId91$ === void 0 ? void 0 : _$appointmentId91$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId92 = _.appointmentId) === null || _$appointmentId92 === void 0 ? void 0 : (_$appointmentId92$ = _$appointmentId92[0]) === null || _$appointmentId92$ === void 0 ? void 0 : _$appointmentId92$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId93 = _.appointmentId) === null || _$appointmentId93 === void 0 ? void 0 : (_$appointmentId93$ = _$appointmentId93[0]) === null || _$appointmentId93$ === void 0 ? void 0 : _$appointmentId93$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId94 = _.appointmentId) === null || _$appointmentId94 === void 0 ? void 0 : (_$appointmentId94$ = _$appointmentId94[0]) === null || _$appointmentId94$ === void 0 ? void 0 : _$appointmentId94$.start, "hh:mm A") : "",
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId121 = _.appointmentId) === null || _$appointmentId121 === void 0 ? void 0 : (_$appointmentId121$ = _$appointmentId121[0]) === null || _$appointmentId121$ === void 0 ? void 0 : (_$appointmentId121$$P = _$appointmentId121$.PersonID) === null || _$appointmentId121$$P === void 0 ? void 0 : (_$appointmentId121$$P2 = _$appointmentId121$$P[0]) === null || _$appointmentId121$$P2 === void 0 ? void 0 : (_$appointmentId121$$P3 = _$appointmentId121$$P2.photo) === null || _$appointmentId121$$P3 === void 0 ? void 0 : (_$appointmentId121$$P4 = _$appointmentId121$$P3[0]) === null || _$appointmentId121$$P4 === void 0 ? void 0 : _$appointmentId121$$P4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId122 = _.appointmentId) === null || _$appointmentId122 === void 0 ? void 0 : (_$appointmentId122$ = _$appointmentId122[0]) === null || _$appointmentId122$ === void 0 ? void 0 : (_$appointmentId122$$P = _$appointmentId122$.PersonID) === null || _$appointmentId122$$P === void 0 ? void 0 : (_$appointmentId122$$P2 = _$appointmentId122$$P[0]) === null || _$appointmentId122$$P2 === void 0 ? void 0 : (_$appointmentId122$$P3 = _$appointmentId122$$P2.photo) === null || _$appointmentId122$$P3 === void 0 ? void 0 : (_$appointmentId122$$P4 = _$appointmentId122$$P3[0]) === null || _$appointmentId122$$P4 === void 0 ? void 0 : _$appointmentId122$$P4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id52 = _.patient_id) === null || _$patient_id52 === void 0 ? void 0 : (_$patient_id52$ = _$patient_id52[0]) === null || _$patient_id52$ === void 0 ? void 0 : (_$patient_id52$$name = _$patient_id52$.name) === null || _$patient_id52$$name === void 0 ? void 0 : _$patient_id52$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id53 = _.patient_id) === null || _$patient_id53 === void 0 ? void 0 : (_$patient_id53$ = _$patient_id53[0]) === null || _$patient_id53$ === void 0 ? void 0 : _$patient_id53$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId123 = _.appointmentId) === null || _$appointmentId123 === void 0 ? void 0 : (_$appointmentId123$ = _$appointmentId123[0]) === null || _$appointmentId123$ === void 0 ? void 0 : _$appointmentId123$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId124 = _.appointmentId) === null || _$appointmentId124 === void 0 ? void 0 : (_$appointmentId124$ = _$appointmentId124[0]) === null || _$appointmentId124$ === void 0 ? void 0 : _$appointmentId124$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId125 = _.appointmentId) === null || _$appointmentId125 === void 0 ? void 0 : (_$appointmentId125$ = _$appointmentId125[0]) === null || _$appointmentId125$ === void 0 ? void 0 : _$appointmentId125$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId126 = _.appointmentId) === null || _$appointmentId126 === void 0 ? void 0 : (_$appointmentId126$ = _$appointmentId126[0]) === null || _$appointmentId126$ === void 0 ? void 0 : _$appointmentId126$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId127 = _.appointmentId) === null || _$appointmentId127 === void 0 ? void 0 : (_$appointmentId127$ = _$appointmentId127[0]) === null || _$appointmentId127$ === void 0 ? void 0 : _$appointmentId127$.start, "hh:mm A") : "",
               visitType: (_$visit_type11 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type11 !== void 0 ? _$visit_type11 : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId95 = _.appointmentId) === null || _$appointmentId95 === void 0 ? void 0 : (_$appointmentId95$ = _$appointmentId95[0]) === null || _$appointmentId95$ === void 0 ? void 0 : (_$appointmentId95$$Sp = _$appointmentId95$.SpecialtyID) === null || _$appointmentId95$$Sp === void 0 ? void 0 : _$appointmentId95$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId128 = _.appointmentId) === null || _$appointmentId128 === void 0 ? void 0 : (_$appointmentId128$ = _$appointmentId128[0]) === null || _$appointmentId128$ === void 0 ? void 0 : (_$appointmentId128$$S = _$appointmentId128$.SpecialtyID) === null || _$appointmentId128$$S === void 0 ? void 0 : _$appointmentId128$$S.map(function (spl) {
                 var _spl$coding18, _spl$coding18$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding18 = spl.coding) === null || _spl$coding18 === void 0 ? void 0 : (_spl$coding18$ = _spl$coding18[0]) === null || _spl$coding18$ === void 0 ? void 0 : _spl$coding18$.display;
@@ -39310,7 +39424,15 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail21 = _.practitioner_details) === null || _$practitioner_detail21 === void 0 ? void 0 : (_$practitioner_detail22 = _$practitioner_detail21[0]) === null || _$practitioner_detail22 === void 0 ? void 0 : _$practitioner_detail22.clinic) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status12 = _.status) === null || _$status12 === void 0 ? void 0 : _$status12.display) || "",
               "View Patient": true,
-              Attend: true
+              Attend: true,
+              type: "OP",
+              appNo: (_$appointmentId$0$id12 = _ === null || _ === void 0 ? void 0 : (_$appointmentId129 = _.appointmentId) === null || _$appointmentId129 === void 0 ? void 0 : (_$appointmentId129$ = _$appointmentId129[0]) === null || _$appointmentId129$ === void 0 ? void 0 : _$appointmentId129$.id) !== null && _$appointmentId$0$id12 !== void 0 ? _$appointmentId$0$id12 : '',
+              data: _,
+              enId: _.id,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId130 = _.appointmentId) === null || _$appointmentId130 === void 0 ? void 0 : (_$appointmentId130$ = _$appointmentId130[0]) === null || _$appointmentId130$ === void 0 ? void 0 : (_$appointmentId130$$P = _$appointmentId130$.PersonID) === null || _$appointmentId130$$P === void 0 ? void 0 : (_$appointmentId130$$P2 = _$appointmentId130$$P[0]) === null || _$appointmentId130$$P2 === void 0 ? void 0 : _$appointmentId130$$P2.birthDay),
+              gender: _ === null || _ === void 0 ? void 0 : (_$appointmentId131 = _.appointmentId) === null || _$appointmentId131 === void 0 ? void 0 : (_$appointmentId131$ = _$appointmentId131[0]) === null || _$appointmentId131$ === void 0 ? void 0 : (_$appointmentId131$$P = _$appointmentId131$.PersonID) === null || _$appointmentId131$$P === void 0 ? void 0 : (_$appointmentId131$$P2 = _$appointmentId131$$P[0]) === null || _$appointmentId131$$P2 === void 0 ? void 0 : _$appointmentId131$$P2.gender,
+              contact: (_$patient_id$0$teleco12 = _ === null || _ === void 0 ? void 0 : (_$patient_id54 = _.patient_id) === null || _$patient_id54 === void 0 ? void 0 : (_$patient_id54$ = _$patient_id54[0]) === null || _$patient_id54$ === void 0 ? void 0 : (_$patient_id54$$telec = _$patient_id54$.telecom) === null || _$patient_id54$$telec === void 0 ? void 0 : (_$patient_id54$$telec2 = _$patient_id54$$telec[0]) === null || _$patient_id54$$telec2 === void 0 ? void 0 : _$patient_id54$$telec2.value) !== null && _$patient_id$0$teleco12 !== void 0 ? _$patient_id$0$teleco12 : "",
+              pId: _ === null || _ === void 0 ? void 0 : (_$patient_id55 = _.patient_id) === null || _$patient_id55 === void 0 ? void 0 : _$patient_id55.id
             };
           }) : [];
           return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40737,7 +40859,7 @@ var orderSetDropDown = {
 };
 
 var makeRadiologyData = function makeRadiologyData(order, info) {
-  var _order$ordercategory, _info$org_id, _info$patientId, _info$encounterType, _info$encounterId, _order$orderSetsCode, _order$name, _order$ordercategory$, _order$ordercategory2, _order$orderType$_id, _order$orderType, _order$orderNature, _order$priority, _moment$unix, _order$startDay, _order$orderQty, _order$orderQtyUOM$_i, _order$orderQtyUOM, _info$status$value, _info$status, _order$freqValue, _order$freqValueUnit$, _order$freqValueUnit, _order$freqRate, _order$freqRateUnit$_, _order$freqRateUnit, _order$duration, _order$durationType$_, _order$durationType, _info$accessionNum, _order$IVDosDurValue, _order$IVDosDurUOM$_i, _order$IVDosDurUOM;
+  var _order$ordercategory, _info$org_id, _info$patientId, _info$encounterType, _info$encounterId, _order$orderSetsCode, _order$name, _order$orderType$_id, _order$orderType, _order$orderNature, _order$priority, _moment$unix, _order$startDay, _order$orderQty, _order$orderQtyUOM$_i, _order$orderQtyUOM, _info$status$value, _info$status, _order$freqValue, _order$freqValueUnit$, _order$freqValueUnit, _order$freqRate, _order$freqRateUnit$_, _order$freqRateUnit, _order$duration, _order$durationType$_, _order$durationType, _info$accessionNum, _order$IVDosDurValue, _order$IVDosDurUOM$_i, _order$IVDosDurUOM;
 
   return {
     db_name: dbName,
@@ -40755,7 +40877,7 @@ var makeRadiologyData = function makeRadiologyData(order, info) {
       order_Id: "",
       orderSetCode: (_order$orderSetsCode = order === null || order === void 0 ? void 0 : order.orderSetsCode) !== null && _order$orderSetsCode !== void 0 ? _order$orderSetsCode : "",
       orderCatalog: (_order$name = order === null || order === void 0 ? void 0 : order.name) !== null && _order$name !== void 0 ? _order$name : "",
-      orderCategory: (_order$ordercategory$ = order === null || order === void 0 ? void 0 : (_order$ordercategory2 = order.ordercategory) === null || _order$ordercategory2 === void 0 ? void 0 : _order$ordercategory2._id) !== null && _order$ordercategory$ !== void 0 ? _order$ordercategory$ : "",
+      orderCategory: "",
       OrderType: (_order$orderType$_id = order === null || order === void 0 ? void 0 : (_order$orderType = order.orderType) === null || _order$orderType === void 0 ? void 0 : _order$orderType._id) !== null && _order$orderType$_id !== void 0 ? _order$orderType$_id : "",
       OrderNature: (_order$orderNature = order === null || order === void 0 ? void 0 : order.orderNature) !== null && _order$orderNature !== void 0 ? _order$orderNature : "",
       orderMode: "",
@@ -42778,10 +42900,10 @@ var pendingTasksApiActions = {
 
 var query = {
   getAssignPractitonerList: function getAssignPractitonerList(data) {
-    return "{\n                \"db_name\": \"".concat(dbName, "\",\n                \"entity\": \"Appointment,Encounter\",\n                \"filter\": {\n                \"Appointment\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "\",\n                \"Encounter\": \"Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && (LIKE (document(Encounter.status).display,'triaged', true) || LIKE (document(Encounter.status).display,'checked-in', true))\"\n                },\n                \"return_fields\": \"{Appointment:Appointment,Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounter_no'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status)})}\"\n                }");
+    return "{\n                \"db_name\": \"".concat(dbName, "\",\n                \"entity\": \"Appointment,Encounter\",\n                \"filter\": {\n                \"Appointment\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "\",\n                \"Encounter\": \"Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && Encounter.participant == [] && (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))\"\n                },\n                \"return_fields\": \"{Appointment:Appointment,Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounter_no'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status)})}\"\n                }");
   },
   getReAssignPractitonerList: function getReAssignPractitonerList(data) {
-    return "{\n                \"db_name\": \"".concat(dbName, "\",\n                \"entity\": \"Appointment,Encounter\",\n                \"filter\": {\n                \"Appointment\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "\",\n                \"Encounter\": \"Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && (LIKE (document(Encounter.status).display,'triaged', true) || LIKE (document(Encounter.status).display,'checked-in', true))\"\n                },\n                \"return_fields\": \"{Appointment:Appointment,Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounter_no'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status)},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))}))}))})}\"\n                }");
+    return "{\n                \"db_name\": \"".concat(dbName, "\",\n                \"entity\": \"Appointment,Encounter\",\n                \"filter\": {\n                \"Appointment\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " \",\n                \"Encounter\": \"Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && Encounter.participant != [] && (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))\"\n                },\n                \"return_fields\": \"{Appointment:Appointment,Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounter_no'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status)},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))}))}))})}\"\n                }");
   },
   getClosePractitonerList: function getClosePractitonerList(data) {
     return "{\n      \"db_name\": \"".concat(dbName, "\",\n      \"entity\": \"Encounter,Appointment\",\n      \"filter\": {\n        \"Encounter\": \"Encounter.activestatus==true && lower(document(Encounter.status).display)=='consultation over'\",\n        \"Appointment\": \"Appointment.id in Encounter.appointmentId && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "\"\n      },\n      \"return_fields\": \"merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender)}))},{status:document(Encounter.status)},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)})})\"\n    }");
@@ -42814,17 +42936,17 @@ var GET_ASSIGN_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getAssignP
         case 5:
           data = _context.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (_) {
-            var _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter$patient_i4, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Encounter3, _$Encounter3$patient_, _$Encounter3$patient_2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Appointment, _$Appointment2, _$Appointment3, _$Encounter5, _$Encounter6, _$Encounter7, _$Encounter7$status;
+            var _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Encounter3, _$Encounter3$patient_, _$Encounter3$patient_2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Appointment, _$Appointment2, _$Appointment3, _$Encounter5, _$Encounter6, _$Encounter7, _$Encounter7$status;
 
             return {
-              name: _ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : (_$Encounter$patient_i4 = _$Encounter$patient_i3[0]) === null || _$Encounter$patient_i4 === void 0 ? void 0 : _$Encounter$patient_i4.given,
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$Encounter3 = _.Encounter) === null || _$Encounter3 === void 0 ? void 0 : (_$Encounter3$patient_ = _$Encounter3.patient_id) === null || _$Encounter3$patient_ === void 0 ? void 0 : (_$Encounter3$patient_2 = _$Encounter3$patient_[0]) === null || _$Encounter3$patient_2 === void 0 ? void 0 : _$Encounter3$patient_2.age,
               mobileNo: _ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$patient_ = _$Encounter4.patient_id) === null || _$Encounter4$patient_ === void 0 ? void 0 : (_$Encounter4$patient_2 = _$Encounter4$patient_[0]) === null || _$Encounter4$patient_2 === void 0 ? void 0 : (_$Encounter4$patient_3 = _$Encounter4$patient_2.telecom) === null || _$Encounter4$patient_3 === void 0 ? void 0 : (_$Encounter4$patient_4 = _$Encounter4$patient_3[0]) === null || _$Encounter4$patient_4 === void 0 ? void 0 : _$Encounter4$patient_4.value,
               apptRefNo: _ === null || _ === void 0 ? void 0 : (_$Appointment = _.Appointment) === null || _$Appointment === void 0 ? void 0 : _$Appointment.appno,
               // "apptDate&Time":_.Appointment.start,
               "apptDate&Time": (_ === null || _ === void 0 ? void 0 : (_$Appointment2 = _.Appointment) === null || _$Appointment2 === void 0 ? void 0 : _$Appointment2.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment3 = _.Appointment) === null || _$Appointment3 === void 0 ? void 0 : _$Appointment3.start, "DD MMM,YYYY hh:mm A") : "",
-              encounterNo: _ === null || _ === void 0 ? void 0 : (_$Encounter5 = _.Encounter) === null || _$Encounter5 === void 0 ? void 0 : _$Encounter5.encounter_no,
+              encounterNo: "EN-".concat(_ === null || _ === void 0 ? void 0 : (_$Encounter5 = _.Encounter) === null || _$Encounter5 === void 0 ? void 0 : _$Encounter5._key),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter6 = _.Encounter) === null || _$Encounter6 === void 0 ? void 0 : _$Encounter6.visit_type,
               status: _ === null || _ === void 0 ? void 0 : (_$Encounter7 = _.Encounter) === null || _$Encounter7 === void 0 ? void 0 : (_$Encounter7$status = _$Encounter7.status) === null || _$Encounter7$status === void 0 ? void 0 : _$Encounter7$status.display,
               action: "AssignPractitioner",
@@ -42874,17 +42996,17 @@ var GET_REASSIGN_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getReAss
         case 5:
           data = _context2.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : _data$result2.map(function (_) {
-            var _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Encounter8$patient_3, _$Encounter8$patient_4, _$Encounter9, _$Encounter9$particip, _$Encounter9$particip2, _$Encounter9$particip3, _$Encounter9$particip4, _$Encounter9$particip5, _$Encounter9$particip6, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter11, _$Encounter11$patient, _$Encounter11$patient2, _$Encounter12, _$Encounter12$patient, _$Encounter12$patient2, _$Encounter12$patient3, _$Encounter12$patient4, _$Appointment4, _$Appointment5, _$Appointment6, _$Encounter13, _$Encounter14, _$Encounter15, _$Encounter15$status;
+            var _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Encounter8$patient_3, _$Encounter9, _$Encounter9$particip, _$Encounter9$particip2, _$Encounter9$particip3, _$Encounter9$particip4, _$Encounter9$particip5, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter11, _$Encounter11$patient, _$Encounter11$patient2, _$Encounter12, _$Encounter12$patient, _$Encounter12$patient2, _$Encounter12$patient3, _$Encounter12$patient4, _$Appointment4, _$Appointment5, _$Appointment6, _$Encounter13, _$Encounter14, _$Encounter15, _$Encounter15$status;
 
             return {
-              name: _ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : (_$Encounter8$patient_4 = _$Encounter8$patient_3[0]) === null || _$Encounter8$patient_4 === void 0 ? void 0 : _$Encounter8$patient_4.given,
-              assignedPractitioner: _ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$particip = _$Encounter9.participant) === null || _$Encounter9$particip === void 0 ? void 0 : (_$Encounter9$particip2 = _$Encounter9$particip[0]) === null || _$Encounter9$particip2 === void 0 ? void 0 : (_$Encounter9$particip3 = _$Encounter9$particip2.Practitioner_id) === null || _$Encounter9$particip3 === void 0 ? void 0 : (_$Encounter9$particip4 = _$Encounter9$particip3[0]) === null || _$Encounter9$particip4 === void 0 ? void 0 : (_$Encounter9$particip5 = _$Encounter9$particip4.name) === null || _$Encounter9$particip5 === void 0 ? void 0 : (_$Encounter9$particip6 = _$Encounter9$particip5[0]) === null || _$Encounter9$particip6 === void 0 ? void 0 : _$Encounter9$particip6.given,
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : (_$Encounter8$patient_3 = _$Encounter8$patient_2.name) === null || _$Encounter8$patient_3 === void 0 ? void 0 : _$Encounter8$patient_3[0]) || {}),
+              assignedPractitioner: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$particip = _$Encounter9.participant) === null || _$Encounter9$particip === void 0 ? void 0 : (_$Encounter9$particip2 = _$Encounter9$particip[0]) === null || _$Encounter9$particip2 === void 0 ? void 0 : (_$Encounter9$particip3 = _$Encounter9$particip2.Practitioner_id) === null || _$Encounter9$particip3 === void 0 ? void 0 : (_$Encounter9$particip4 = _$Encounter9$particip3[0]) === null || _$Encounter9$particip4 === void 0 ? void 0 : (_$Encounter9$particip5 = _$Encounter9$particip4.name) === null || _$Encounter9$particip5 === void 0 ? void 0 : _$Encounter9$particip5[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter10 = _.Encounter) === null || _$Encounter10 === void 0 ? void 0 : (_$Encounter10$patient = _$Encounter10.patient_id) === null || _$Encounter10$patient === void 0 ? void 0 : (_$Encounter10$patient2 = _$Encounter10$patient[0]) === null || _$Encounter10$patient2 === void 0 ? void 0 : _$Encounter10$patient2.MRN,
               age: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : (_$Encounter11$patient = _$Encounter11.patient_id) === null || _$Encounter11$patient === void 0 ? void 0 : (_$Encounter11$patient2 = _$Encounter11$patient[0]) === null || _$Encounter11$patient2 === void 0 ? void 0 : _$Encounter11$patient2.age,
               mobileNo: _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$patient = _$Encounter12.patient_id) === null || _$Encounter12$patient === void 0 ? void 0 : (_$Encounter12$patient2 = _$Encounter12$patient[0]) === null || _$Encounter12$patient2 === void 0 ? void 0 : (_$Encounter12$patient3 = _$Encounter12$patient2.telecom) === null || _$Encounter12$patient3 === void 0 ? void 0 : (_$Encounter12$patient4 = _$Encounter12$patient3[0]) === null || _$Encounter12$patient4 === void 0 ? void 0 : _$Encounter12$patient4.value,
               apptRefNo: _ === null || _ === void 0 ? void 0 : (_$Appointment4 = _.Appointment) === null || _$Appointment4 === void 0 ? void 0 : _$Appointment4.appno,
               "apptDate&Time": (_ === null || _ === void 0 ? void 0 : (_$Appointment5 = _.Appointment) === null || _$Appointment5 === void 0 ? void 0 : _$Appointment5.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment6 = _.Appointment) === null || _$Appointment6 === void 0 ? void 0 : _$Appointment6.start, "DD MMM,YYYY hh:mm A") : "",
-              encounterNo: _ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : _$Encounter13.encounter_no,
+              encounterNo: "EN-".concat(_ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : _$Encounter13._key),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter14 = _.Encounter) === null || _$Encounter14 === void 0 ? void 0 : _$Encounter14.visit_type,
               status: _ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$status = _$Encounter15.status) === null || _$Encounter15$status === void 0 ? void 0 : _$Encounter15$status.display,
               action: "ReassignPractitioner",
@@ -42934,17 +43056,17 @@ var GET_CLOSE_PRACTITIONER_LIST = createAsyncThunk("workListApiSlice/getClosePra
         case 5:
           data = _context3.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result3 = data.result) === null || _data$result3 === void 0 ? void 0 : _data$result3.map(function (_) {
-            var _$patient_id$0$name$, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id$$name$, _$appointmentId$pract, _$appointmentId, _$appointmentId$pract2, _$appointmentId$pract3, _$appointmentId$pract4, _$appointmentId$pract5, _$patient_id$0$alias, _$patient_id2, _$patient_id2$, _$patient_id$0$age, _$patient_id3, _$patient_id3$, _$patient_id$0$teleco, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$appointmentId$appno, _$appointmentId2, _$appointmentId3, _$appointmentId4, _$encounter_no, _$visit_type, _$status$display, _$status;
+            var _$patient_id$0$name$, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id$$name$, _$practitioner_detail, _$practitioner_detail2, _$practitioner_detail3, _$patient_id$0$alias, _$patient_id2, _$patient_id2$, _$patient_id$0$age, _$patient_id3, _$patient_id3$, _$patient_id$0$teleco, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$appointmentId$appno, _$appointmentId, _$appointmentId2, _$appointmentId3, _ref7, _$visit_type, _$status$display, _$status;
 
             return {
               name: (_$patient_id$0$name$ = _ === 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$ = _$patient_id$$name[0]) === null || _$patient_id$$name$ === void 0 ? void 0 : _$patient_id$$name$.given) !== null && _$patient_id$0$name$ !== void 0 ? _$patient_id$0$name$ : "",
-              assignedPractitioner: (_$appointmentId$pract = _ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$pract2 = _$appointmentId.practitionerID) === null || _$appointmentId$pract2 === void 0 ? void 0 : (_$appointmentId$pract3 = _$appointmentId$pract2[0]) === null || _$appointmentId$pract3 === void 0 ? void 0 : (_$appointmentId$pract4 = _$appointmentId$pract3.name) === null || _$appointmentId$pract4 === void 0 ? void 0 : (_$appointmentId$pract5 = _$appointmentId$pract4[0]) === null || _$appointmentId$pract5 === void 0 ? void 0 : _$appointmentId$pract5.text) !== null && _$appointmentId$pract !== void 0 ? _$appointmentId$pract : "",
+              assignedPractitioner: (_$practitioner_detail = _ === null || _ === void 0 ? void 0 : (_$practitioner_detail2 = _.practitioner_details) === null || _$practitioner_detail2 === void 0 ? void 0 : (_$practitioner_detail3 = _$practitioner_detail2[0]) === null || _$practitioner_detail3 === void 0 ? void 0 : _$practitioner_detail3.id_name) !== null && _$practitioner_detail !== void 0 ? _$practitioner_detail : "",
               mrn: (_$patient_id$0$alias = _ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.alias) !== null && _$patient_id$0$alias !== void 0 ? _$patient_id$0$alias : "",
               age: (_$patient_id$0$age = _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : _$patient_id3$.age) !== null && _$patient_id$0$age !== void 0 ? _$patient_id$0$age : "",
               mobileNo: (_$patient_id$0$teleco = _ === 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$$teleco = _$patient_id4$.telecom) === null || _$patient_id4$$teleco === void 0 ? void 0 : (_$patient_id4$$teleco2 = _$patient_id4$$teleco[0]) === null || _$patient_id4$$teleco2 === void 0 ? void 0 : _$patient_id4$$teleco2.value) !== null && _$patient_id$0$teleco !== void 0 ? _$patient_id$0$teleco : "",
-              apptRefNo: (_$appointmentId$appno = _ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : _$appointmentId2.appno) !== null && _$appointmentId$appno !== void 0 ? _$appointmentId$appno : "",
-              "apptDate&Time": (_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : _$appointmentId3.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : _$appointmentId4.start, "DD MMM,YYYY hh:mm A") : "",
-              encounterNo: (_$encounter_no = _ === null || _ === void 0 ? void 0 : _.encounter_no) !== null && _$encounter_no !== void 0 ? _$encounter_no : "",
+              apptRefNo: (_$appointmentId$appno = _ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : _$appointmentId.appno) !== null && _$appointmentId$appno !== void 0 ? _$appointmentId$appno : "",
+              "apptDate&Time": (_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : _$appointmentId2.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : _$appointmentId3.start, "DD MMM,YYYY hh:mm A") : "",
+              encounterNo: (_ref7 = "EN-".concat(_ === null || _ === void 0 ? void 0 : _._key)) !== null && _ref7 !== void 0 ? _ref7 : "",
               visitType: (_$visit_type = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type !== void 0 ? _$visit_type : "",
               status: (_$status$display = _ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display) !== null && _$status$display !== void 0 ? _$status$display : "",
               action: "ClosePractitioner",