primarycare-binder 1.1.40 → 1.1.45

package/dist/index.cjs.js

@@ -8391,6 +8391,355 @@ var urls = (_urls = {
   get_hospitals_locality: "/api/v1/getHospitalBasedonLocality"
 }, _defineProperty(_urls, "get_cities", "/api/v1/getCityFromHospital"), _defineProperty(_urls, "get_symptoms", "/api/v1/getSymptoms"), _defineProperty(_urls, "get_speciality", "/api/v1/getSpeciality"), _defineProperty(_urls, "upsert_service", "/api/v1/upsertService"), _defineProperty(_urls, "read_service", "/api/v1/readService"), _defineProperty(_urls, "delete_service", "/api/v1/deleteService"), _defineProperty(_urls, "upsert_slot", "/api/v1/upsertSlot"), _defineProperty(_urls, "read_slot", "api/v1/readSlot"), _defineProperty(_urls, "delete_slot", "api/v1/deleteSlot"), _defineProperty(_urls, "slot_availability", "api/v1/readAvailibalityChecking"), _defineProperty(_urls, "upsert_task", "api/v1/upsertTask"), _defineProperty(_urls, "read_task", "api/v1/readTask"), _defineProperty(_urls, "delete_task", "api/v1/deleteTask"), _defineProperty(_urls, "upsert_schedule", "api/v1/upsertSchedule"), _defineProperty(_urls, "read_schedule", "api/v1/readSchedule"), _defineProperty(_urls, "delete_schedule", "api/v1/deleteSchedule"), _defineProperty(_urls, "upsert_person", "api/v1/upsertPerson"), _defineProperty(_urls, "read_person", "api/v1/readPerson"), _defineProperty(_urls, "delete_person", "api/v1/deletePerson"), _defineProperty(_urls, "upsert_practitioner_role", "api/v1/upsertPractitionerRole"), _defineProperty(_urls, "read_practitioner_role", "api/v1/readPractitionerRole"), _defineProperty(_urls, "delete_practitioner_role", "api/v1/deletePractitionerRole"), _defineProperty(_urls, "get_user_info", "api/v1/getUserInfo"), _defineProperty(_urls, "oraganization_registration", "api/v1/orgUserRegistration"), _defineProperty(_urls, "oraganization_siginIn", "".concat(__keyClockLogin__, "/api/v1/orgUserSignIn")), _defineProperty(_urls, "oraganization_registet_patient", "api/v1/upsert_document"), _urls);
 
+var makeName = function makeName() {
+  var _prefix$coding, _prefix$coding$, _suffix$coding, _suffix$coding$;
+
+  var nameObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _nameObj$prefix = nameObj.prefix,
+      prefix = _nameObj$prefix === void 0 ? "" : _nameObj$prefix,
+      _nameObj$text = nameObj.text,
+      text = _nameObj$text === void 0 ? "" : _nameObj$text,
+      _nameObj$given = nameObj.given,
+      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(family && family + " ").concat(suffixVal && suffixVal);
+};
+
+var fetchData$3 = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(input) {
+    var url,
+        __options,
+        res,
+        data,
+        _args = arguments;
+
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            url = _args.length > 1 && _args[1] !== undefined ? _args[1] : __baseUrl__;
+            __options = {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: {}
+            };
+            _context.next = 4;
+            return fetch(url, _objectSpread2(_objectSpread2({}, __options), input));
+
+          case 4:
+            res = _context.sent;
+            _context.next = 7;
+            return res.json();
+
+          case 7:
+            data = _context.sent;
+            return _context.abrupt("return", data);
+
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function fetchData(_x) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+
+var getImgUrl = function getImgUrl(fileId) {
+  return fileId ? "".concat(__imgdownloadBaseUrl__).concat(fileId) : "";
+};
+
+var getUtcTime = function getUtcTime(date) {
+  if (date) {
+    return moment.utc(date).unix();
+  } else {
+    return moment.utc().unix();
+  }
+};
+
+var utcTOLocal$1 = function utcTOLocal(date, format) {
+  var Ndate = new Date();
+
+  if (typeof date === "number") {
+    Ndate = moment.unix(date);
+  } else {
+    Ndate = moment(date);
+  }
+
+  var fmt = format ? format : "DD-MM-YYYY";
+  return moment.utc(Ndate).local().format(fmt);
+}; // const getUtcTime = (date) => {
+//   let a = null
+//   if (date) {
+//     a = new Date(date)
+//   } else {
+//     a = new Date()
+//   }
+//   a = a.toUTCString()
+//   return ((new Date(a).getTime())/1000)
+// };
+// const utcTOLocal = (date, format) => {
+//   let Ndate = new Date(date * 1000);
+//   let fmt = format ? format : "DD-MM-YYYY"
+//   if (format) {
+//     return moment(Ndate).format(fmt);
+//   } else {
+//     return moment(Ndate)
+//   }
+// };
+
+
+var deg2rad = function deg2rad(deg) {
+  return deg * (Math.PI / 180);
+};
+
+var getDisctanceFromLatLonInKm = function getDisctanceFromLatLonInKm(lat1, lon1, lat2, lon2) {
+  var R = 6371; // Radius of the earth in km
+
+  var dLat = deg2rad(lat2 - lat1); // deg2rad below
+
+  var dLon = deg2rad(lon2 - lon1);
+  var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  var d = R * c; // Distance in km
+
+  return parseFloat(d).toFixed(2);
+};
+
+var getLocation = function getLocation() {
+  return new es6Promise.Promise(function (resolve, reject) {
+    navigator.geolocation.getCurrentPosition(function (position) {
+      var lat = position.coords.latitude;
+      var _long = position.coords.longitude;
+      resolve([false, {
+        lat: lat,
+        "long": _long
+      }]);
+    }, function (error) {
+      resolve([true, error]);
+    });
+  });
+};
+
+var getCurrentPosition = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    var permission, lat, _long2, _yield$getLocation, _yield$getLocation2, err, currLocation;
+
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return navigator.permissions.query({
+              name: 'geolocation'
+            })["catch"](function (err) {
+              return {
+                state: 'denied'
+              };
+            });
+
+          case 2:
+            permission = _context2.sent;
+
+            if (!(permission.state !== 'denied')) {
+              _context2.next = 11;
+              break;
+            }
+
+            _context2.next = 6;
+            return getLocation();
+
+          case 6:
+            _yield$getLocation = _context2.sent;
+            _yield$getLocation2 = _slicedToArray(_yield$getLocation, 2);
+            err = _yield$getLocation2[0];
+            currLocation = _yield$getLocation2[1];
+
+            if (!err) {
+              lat = currLocation.lat;
+              _long2 = currLocation["long"];
+            }
+
+          case 11:
+            return _context2.abrupt("return", {
+              lat: lat,
+              "long": _long2
+            });
+
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function getCurrentPosition() {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var getLatLong = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(city) {
+    var _resp$results, _resp$results$, _resp$results$$geomet, _resp$results$$geomet2, _resp$results2, _resp$results2$, _resp$results2$$geome, _resp$results2$$geome2;
+
+    var url, data, resp, lat, _long3, _resp$results3, _resp$results3$, _resp$results3$$geome, _resp$results3$$geome2, _resp$results4, _resp$results4$, _resp$results4$$geome, _resp$results4$$geome2;
+
+    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            url = "https://maps.googleapis.com/maps/api/geocode/json?address=".concat(city, "&key=AIzaSyBqeACJgp12OLU6EkHeUtFgya2naH1LhrU");
+            _context3.next = 3;
+            return fetch(url);
+
+          case 3:
+            data = _context3.sent;
+            _context3.next = 6;
+            return data.json();
+
+          case 6:
+            resp = _context3.sent;
+
+            if ((resp === null || resp === void 0 ? void 0 : (_resp$results = resp.results) === null || _resp$results === void 0 ? void 0 : (_resp$results$ = _resp$results[0]) === null || _resp$results$ === void 0 ? void 0 : (_resp$results$$geomet = _resp$results$.geometry) === null || _resp$results$$geomet === void 0 ? void 0 : (_resp$results$$geomet2 = _resp$results$$geomet.location) === null || _resp$results$$geomet2 === void 0 ? void 0 : _resp$results$$geomet2.lat) && (resp === null || resp === void 0 ? void 0 : (_resp$results2 = resp.results) === null || _resp$results2 === void 0 ? void 0 : (_resp$results2$ = _resp$results2[0]) === null || _resp$results2$ === void 0 ? void 0 : (_resp$results2$$geome = _resp$results2$.geometry) === null || _resp$results2$$geome === void 0 ? void 0 : (_resp$results2$$geome2 = _resp$results2$$geome.location) === null || _resp$results2$$geome2 === void 0 ? void 0 : _resp$results2$$geome2.lng)) {
+              lat = resp === null || resp === void 0 ? void 0 : (_resp$results3 = resp.results) === null || _resp$results3 === void 0 ? void 0 : (_resp$results3$ = _resp$results3[0]) === null || _resp$results3$ === void 0 ? void 0 : (_resp$results3$$geome = _resp$results3$.geometry) === null || _resp$results3$$geome === void 0 ? void 0 : (_resp$results3$$geome2 = _resp$results3$$geome.location) === null || _resp$results3$$geome2 === void 0 ? void 0 : _resp$results3$$geome2.lat;
+              _long3 = resp === null || resp === void 0 ? void 0 : (_resp$results4 = resp.results) === null || _resp$results4 === void 0 ? void 0 : (_resp$results4$ = _resp$results4[0]) === null || _resp$results4$ === void 0 ? void 0 : (_resp$results4$$geome = _resp$results4$.geometry) === null || _resp$results4$$geome === void 0 ? void 0 : (_resp$results4$$geome2 = _resp$results4$$geome.location) === null || _resp$results4$$geome2 === void 0 ? void 0 : _resp$results4$$geome2.lng;
+            }
+
+            return _context3.abrupt("return", {
+              lat: lat,
+              "long": _long3
+            });
+
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+
+  return function getLatLong(_x2) {
+    return _ref5.apply(this, arguments);
+  };
+}(); // Get age using moment
+
+
+var getAge = function getAge(date) {
+  if (date) {
+    var yearDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'years', false);
+
+    if (yearDiff > 0) {
+      return yearDiff + ' Y';
+    }
+
+    var monthDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'months', false);
+
+    if (monthDiff > 0) {
+      return monthDiff + ' M';
+    }
+
+    var dayDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'days', false);
+    return dayDiff + ' D';
+  }
+
+  return "";
+};
+
+var getLocationInfo$1 = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(myLocation, city) {
+    var obj,
+        lat,
+        _long4,
+        info,
+        _args4 = arguments;
+
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            obj = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : {};
+
+            if (obj[city]) {
+              _context4.next = 7;
+              break;
+            }
+
+            lat = myLocation.lat, _long4 = myLocation["long"];
+            _context4.next = 5;
+            return getLatLong(city);
+
+          case 5:
+            info = _context4.sent;
+
+            if (info.lat && info["long"]) {
+              obj[city] = getDisctanceFromLatLonInKm(info.lat, info["long"], lat, _long4);
+            }
+
+          case 7:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function getLocationInfo(_x3, _x4) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+var calculationExp = function calculationExp(jexp) {
+  var expInMs = 0;
+  jexp.forEach(function () {
+    var exp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var start_date = exp.start_date,
+        end_date = exp.end_date;
+
+    if (typeof start_date === "number") {
+      if (typeof end_date === "number") {
+        if (start_date < end_date) {
+          expInMs += (end_date - start_date) * 1000;
+        }
+      } else {
+        expInMs += (Date.now() - start_date) * 1000;
+      }
+    }
+  });
+  var expInDays = moment(expInMs).diff(moment(0), "days");
+  var expInMonths = moment(expInMs).diff(moment(0), "months");
+  var expInYears = moment(expInMs).diff(moment(0), "years");
+
+  if (expInYears >= 1) {
+    var value = Math.floor(expInYears);
+    return "".concat(value, " year") + (value > 1 ? "s" : "");
+  }
+
+  if (expInMonths >= 1) {
+    var _value = Math.floor(expInMonths);
+
+    return "".concat(_value, " month") + (_value > 1 ? "s" : "");
+  }
+
+  if (expInDays >= 1) {
+    var _value2 = Math.floor(expInDays);
+
+    return "".concat(_value2, " day") + (_value2 > 1 ? "s" : "");
+  }
+
+  return "0 days";
+};
+
 var _extraReducers$F;
 var __options$a = {
   method: "POST",
@@ -9194,6 +9543,68 @@ var DELETE_USER = createAsyncThunk("authSlice/deleteUser", /*#__PURE__*/_asyncTo
     }
   }, _callee15, null, [[2, 15]]);
 })));
+var GET_COUNTRY_CODE_LIST = createAsyncThunk("authSlice/country_code_list", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
+  var payload,
+      _ref27,
+      rejectWithValue,
+      queries,
+      data,
+      arry,
+      _args16 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee16$(_context16) {
+    while (1) {
+      switch (_context16.prev = _context16.next) {
+        case 0:
+          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+          _ref27 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref27.rejectWithValue;
+          _context16.prev = 2;
+          queries = {
+            "db_name": dbName,
+            "entity": "SMGeographicMaster",
+            "sort": "SMGeographicMaster.GeoLocationISDCode",
+            "filter": "lower(document(SMGeographicMaster.geogLevelType).display)=='country' && SMGeographicMaster.activestatus == true && SMGeographicMaster.active == true",
+            "return_fields": "{_id:SMGeographicMaster._id,id:SMGeographicMaster.id,geogLevelName:SMGeographicMaster.geogLevelName,parentGeogLevelType:SMGeographicMaster.parentGeogLevelType,parentGeogLevelCode:SMGeographicMaster.parentGeogLevelCode,GeoLocationISDCode:SMGeographicMaster.GeoLocationISDCode}"
+          };
+          _context16.next = 6;
+          return fetchData$3({
+            body: JSON.stringify(queries)
+          }, __readDocumentUrl__);
+
+        case 6:
+          data = _context16.sent;
+          arry = [];
+          data.result.map(function (value) {
+            var _value$GeoLocationISD;
+
+            arry.push({
+              name: value.geogLevelName,
+              flag: "https://upload.wikimedia.org/wikipedia/en/4/41/Flag_of_India.svg",
+              altSpellings: value._id,
+              callingCodes: value === null || value === void 0 ? void 0 : (_value$GeoLocationISD = value.GeoLocationISDCode) === null || _value$GeoLocationISD === void 0 ? void 0 : _value$GeoLocationISD.replaceAll("+", "") // label: value.GeoLocationISDCode,
+              // value: value._id,
+              // ...value
+
+            });
+          });
+          return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: arry
+          }));
+
+        case 12:
+          _context16.prev = 12;
+          _context16.t0 = _context16["catch"](2);
+          return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context16.t0.message
+          })));
+
+        case 15:
+        case "end":
+          return _context16.stop();
+      }
+    }
+  }, _callee16, null, [[2, 12]]);
+})));
 var authSlice = createSlice({
   name: "authSlice",
   initialState: {
@@ -9212,7 +9623,8 @@ var authSlice = createSlice({
     deleteUser: _objectSpread2({}, defaultState.Info),
     changePassword: _objectSpread2({}, defaultState.Info),
     tokenValidate: _objectSpread2({}, defaultState.Info),
-    refreshToken: _objectSpread2({}, defaultState.Info)
+    refreshToken: _objectSpread2({}, defaultState.Info),
+    country_code_list: _objectSpread2({}, defaultState.Info)
   },
   extraReducers: (_extraReducers$F = {}, _defineProperty(_extraReducers$F, REGISTER_USERS.fulfilled, function (state, action) {
     var _action$payload;
@@ -9354,6 +9766,16 @@ var authSlice = createSlice({
     var _action$payload28;
 
     state.refreshToken = (_action$payload28 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload28 !== void 0 ? _action$payload28 : {};
+  }), _defineProperty(_extraReducers$F, GET_COUNTRY_CODE_LIST.fulfilled, function (state, action) {
+    var _action$payload29;
+
+    state.country_code_list = (_action$payload29 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload29 !== void 0 ? _action$payload29 : {};
+  }), _defineProperty(_extraReducers$F, GET_COUNTRY_CODE_LIST.pending, function (state, action) {
+    state.country_code_list.loading = true;
+  }), _defineProperty(_extraReducers$F, GET_COUNTRY_CODE_LIST.rejected, function (state, action) {
+    var _action$payload30;
+
+    state.country_code_list = (_action$payload30 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload30 !== void 0 ? _action$payload30 : {};
   }), _extraReducers$F)
 });
 var authActions = {
@@ -9370,7 +9792,8 @@ var authActions = {
   DELETE_USER: DELETE_USER,
   CHANGE_PASSWORD: CHANGE_PASSWORD,
   TOKEN_VALIDATE: TOKEN_VALIDATE,
-  REFRESH_TOKEN: REFRESH_TOKEN
+  REFRESH_TOKEN: REFRESH_TOKEN,
+  GET_COUNTRY_CODE_LIST: GET_COUNTRY_CODE_LIST
 };
 var authSlice$1 = authSlice.reducer;
 
@@ -9467,271 +9890,6 @@ var fuzzySearchActions = {
 }; // end
 var fuzzySearchReducer$1 = fuzzySearchReducer.reducer;
 
-var makeName = function makeName() {
-  var _prefix$coding, _prefix$coding$, _suffix$coding, _suffix$coding$;
-
-  var nameObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var _nameObj$prefix = nameObj.prefix,
-      prefix = _nameObj$prefix === void 0 ? "" : _nameObj$prefix,
-      _nameObj$text = nameObj.text,
-      text = _nameObj$text === void 0 ? "" : _nameObj$text,
-      _nameObj$given = nameObj.given,
-      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(family && family + " ").concat(suffixVal && suffixVal);
-};
-
-var fetchData$3 = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(input) {
-    var url,
-        __options,
-        res,
-        data,
-        _args = arguments;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            url = _args.length > 1 && _args[1] !== undefined ? _args[1] : __baseUrl__;
-            __options = {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json"
-              },
-              body: {}
-            };
-            _context.next = 4;
-            return fetch(url, _objectSpread2(_objectSpread2({}, __options), input));
-
-          case 4:
-            res = _context.sent;
-            _context.next = 7;
-            return res.json();
-
-          case 7:
-            data = _context.sent;
-            return _context.abrupt("return", data);
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function fetchData(_x) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-
-var getImgUrl = function getImgUrl(fileId) {
-  return fileId ? "".concat(__imgdownloadBaseUrl__).concat(fileId) : "";
-};
-
-var getUtcTime = function getUtcTime(date) {
-  if (date) {
-    return moment.utc(date).unix();
-  } else {
-    return moment.utc().unix();
-  }
-};
-
-var utcTOLocal$1 = function utcTOLocal(date, format) {
-  var Ndate = new Date();
-
-  if (typeof date === "number") {
-    Ndate = moment.unix(date);
-  } else {
-    Ndate = moment(date);
-  }
-
-  var fmt = format ? format : "DD-MM-YYYY";
-  return moment.utc(Ndate).local().format(fmt);
-}; // const getUtcTime = (date) => {
-//   let a = null
-//   if (date) {
-//     a = new Date(date)
-//   } else {
-//     a = new Date()
-//   }
-//   a = a.toUTCString()
-//   return ((new Date(a).getTime())/1000)
-// };
-// const utcTOLocal = (date, format) => {
-//   let Ndate = new Date(date * 1000);
-//   let fmt = format ? format : "DD-MM-YYYY"
-//   if (format) {
-//     return moment(Ndate).format(fmt);
-//   } else {
-//     return moment(Ndate)
-//   }
-// };
-
-
-var deg2rad = function deg2rad(deg) {
-  return deg * (Math.PI / 180);
-};
-
-var getDisctanceFromLatLonInKm = function getDisctanceFromLatLonInKm(lat1, lon1, lat2, lon2) {
-  var R = 6371; // Radius of the earth in km
-
-  var dLat = deg2rad(lat2 - lat1); // deg2rad below
-
-  var dLon = deg2rad(lon2 - lon1);
-  var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2);
-  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-  var d = R * c; // Distance in km
-
-  return parseFloat(d).toFixed(2);
-};
-
-var getLocation = function getLocation() {
-  return new es6Promise.Promise(function (resolve, reject) {
-    navigator.geolocation.getCurrentPosition(function (position) {
-      var lat = position.coords.latitude;
-      var _long = position.coords.longitude;
-      resolve([false, {
-        lat: lat,
-        "long": _long
-      }]);
-    }, function (error) {
-      resolve([true, error]);
-    });
-  });
-};
-
-var getCurrentPosition = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-    var permission, lat, _long2, _yield$getLocation, _yield$getLocation2, err, currLocation;
-
-    return regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.next = 2;
-            return navigator.permissions.query({
-              name: 'geolocation'
-            })["catch"](function (err) {
-              return {
-                state: 'denied'
-              };
-            });
-
-          case 2:
-            permission = _context2.sent;
-
-            if (!(permission.state !== 'denied')) {
-              _context2.next = 11;
-              break;
-            }
-
-            _context2.next = 6;
-            return getLocation();
-
-          case 6:
-            _yield$getLocation = _context2.sent;
-            _yield$getLocation2 = _slicedToArray(_yield$getLocation, 2);
-            err = _yield$getLocation2[0];
-            currLocation = _yield$getLocation2[1];
-
-            if (!err) {
-              lat = currLocation.lat;
-              _long2 = currLocation["long"];
-            }
-
-          case 11:
-            return _context2.abrupt("return", {
-              lat: lat,
-              "long": _long2
-            });
-
-          case 12:
-          case "end":
-            return _context2.stop();
-        }
-      }
-    }, _callee2);
-  }));
-
-  return function getCurrentPosition() {
-    return _ref4.apply(this, arguments);
-  };
-}();
-
-var getLatLong = /*#__PURE__*/function () {
-  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(city) {
-    var _resp$results, _resp$results$, _resp$results$$geomet, _resp$results$$geomet2, _resp$results2, _resp$results2$, _resp$results2$$geome, _resp$results2$$geome2;
-
-    var url, data, resp, lat, _long3, _resp$results3, _resp$results3$, _resp$results3$$geome, _resp$results3$$geome2, _resp$results4, _resp$results4$, _resp$results4$$geome, _resp$results4$$geome2;
-
-    return regeneratorRuntime.wrap(function _callee3$(_context3) {
-      while (1) {
-        switch (_context3.prev = _context3.next) {
-          case 0:
-            url = "https://maps.googleapis.com/maps/api/geocode/json?address=".concat(city, "&key=AIzaSyBqeACJgp12OLU6EkHeUtFgya2naH1LhrU");
-            _context3.next = 3;
-            return fetch(url);
-
-          case 3:
-            data = _context3.sent;
-            _context3.next = 6;
-            return data.json();
-
-          case 6:
-            resp = _context3.sent;
-
-            if ((resp === null || resp === void 0 ? void 0 : (_resp$results = resp.results) === null || _resp$results === void 0 ? void 0 : (_resp$results$ = _resp$results[0]) === null || _resp$results$ === void 0 ? void 0 : (_resp$results$$geomet = _resp$results$.geometry) === null || _resp$results$$geomet === void 0 ? void 0 : (_resp$results$$geomet2 = _resp$results$$geomet.location) === null || _resp$results$$geomet2 === void 0 ? void 0 : _resp$results$$geomet2.lat) && (resp === null || resp === void 0 ? void 0 : (_resp$results2 = resp.results) === null || _resp$results2 === void 0 ? void 0 : (_resp$results2$ = _resp$results2[0]) === null || _resp$results2$ === void 0 ? void 0 : (_resp$results2$$geome = _resp$results2$.geometry) === null || _resp$results2$$geome === void 0 ? void 0 : (_resp$results2$$geome2 = _resp$results2$$geome.location) === null || _resp$results2$$geome2 === void 0 ? void 0 : _resp$results2$$geome2.lng)) {
-              lat = resp === null || resp === void 0 ? void 0 : (_resp$results3 = resp.results) === null || _resp$results3 === void 0 ? void 0 : (_resp$results3$ = _resp$results3[0]) === null || _resp$results3$ === void 0 ? void 0 : (_resp$results3$$geome = _resp$results3$.geometry) === null || _resp$results3$$geome === void 0 ? void 0 : (_resp$results3$$geome2 = _resp$results3$$geome.location) === null || _resp$results3$$geome2 === void 0 ? void 0 : _resp$results3$$geome2.lat;
-              _long3 = resp === null || resp === void 0 ? void 0 : (_resp$results4 = resp.results) === null || _resp$results4 === void 0 ? void 0 : (_resp$results4$ = _resp$results4[0]) === null || _resp$results4$ === void 0 ? void 0 : (_resp$results4$$geome = _resp$results4$.geometry) === null || _resp$results4$$geome === void 0 ? void 0 : (_resp$results4$$geome2 = _resp$results4$$geome.location) === null || _resp$results4$$geome2 === void 0 ? void 0 : _resp$results4$$geome2.lng;
-            }
-
-            return _context3.abrupt("return", {
-              lat: lat,
-              "long": _long3
-            });
-
-          case 9:
-          case "end":
-            return _context3.stop();
-        }
-      }
-    }, _callee3);
-  }));
-
-  return function getLatLong(_x2) {
-    return _ref5.apply(this, arguments);
-  };
-}(); // Get age using moment
-
-
-var getAge = function getAge(date) {
-  if (date) {
-    var yearDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'years', false);
-
-    if (yearDiff > 0) {
-      return yearDiff + ' Y';
-    }
-
-    var monthDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'months', false);
-
-    if (monthDiff > 0) {
-      return monthDiff + ' M';
-    }
-
-    var dayDiff = moment().diff(moment(date, 'DD/MM/YYYY'), 'days', false);
-    return dayDiff + ' D';
-  }
-
-  return "";
-};
-
 var _extraReducers$D;
 var __options$8 = {
   method: "POST",
@@ -10932,6 +11090,13 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
       _ref8,
       rejectWithValue,
       _practData$,
+      _practData$2,
+      _practData$2$practiti,
+      _practData$2$practiti2,
+      _practData$2$practiti3,
+      _practData$2$practiti4,
+      _practData$2$practiti5,
+      _practData$2$practiti6,
       _resp$result,
       _payload$start,
       start,
@@ -10951,81 +11116,109 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
       practData,
       body,
       resp,
+      _yield$getCurrentPosi,
+      myLat,
+      myLong,
+      locationInfo,
+      city,
+      kms,
       data,
       slots,
       resourceInfo,
       healthCareId,
       info,
-      _practData$2,
       _practData$3,
-      _practData$3$Organiza,
-      _practData$3$Organiza2,
       _practData$4,
       _practData$4$Organiza,
       _practData$4$Organiza2,
-      _practData$4$Organiza3,
       _practData$5,
       _practData$5$Organiza,
       _practData$5$Organiza2,
       _practData$5$Organiza3,
       _practData$6,
       _practData$6$Organiza,
+      _practData$6$Organiza2,
+      _practData$6$Organiza3,
       _practData$7,
       _practData$7$Organiza,
       _practData$8,
+      _practData$8$Organiza,
       _practData$9,
       _practData$10,
       _practData$11,
       _practData$12,
-      _practData$12$photo,
-      _practData$12$photo$,
       _practData$13,
-      _practData$13$practit,
-      _practData$13$practit2,
-      _practData$13$practit3,
+      _practData$13$photo,
+      _practData$13$photo$,
       _practData$14,
-      _practData$14$communi,
+      _practData$14$practit,
+      _practData$14$practit2,
+      _practData$14$practit3,
       _practData$15,
+      _practData$15$communi,
       _practData$16,
-      _practData$16$gender,
-      _practData$16$gender$,
-      _practData$16$gender$2,
-      _ref9,
-      _ref9$forEach,
       _practData$17,
+      _practData$17$gender,
+      _practData$17$gender$,
+      _practData$17$gender$2,
+      _practData$17$gender$3,
+      _ref9,
       _practData$18,
-      _practData$18$qualifi,
-      _practData$18$qualifi2,
+      _practData$18$practit,
+      _practData$18$practit2,
       _practData$19,
       _practData$19$practit,
       _practData$19$practit2,
       _practData$19$practit3,
+      _practData$19$practit4,
+      _practData$19$practit5,
+      _practData$19$practit6,
       _practData$20,
-      _practData$20$address,
-      _practData$20$address2,
+      _practData$20$contact,
+      _practData$20$contact2,
+      _practData$20$contact3,
+      _practData$20$contact4,
       _practData$21,
-      _practData$21$name,
+      _practData$21$qualifi,
+      _practData$21$qualifi2,
       _practData$22,
-      _practData$22$address,
-      _practData$22$address2,
+      _practData$22$practit,
+      _practData$22$practit2,
+      _practData$22$practit3,
       _practData$23,
-      _practData$23$practit,
-      _practData$23$practit2,
-      _practData$23$practit3,
-      _practData$23$practit4,
-      _practData$0$practiti,
+      _practData$23$address,
+      _practData$23$address2,
       _practData$24,
-      _practData$24$practit,
-      _practData$24$practit2,
-      _practData$24$practit3,
+      _practData$24$name,
       _practData$25,
       _practData$25$practit,
       _practData$25$practit2,
+      _practData$25$practit3,
+      _practData$25$practit4,
+      _practData$0$practiti,
       _practData$26,
+      _practData$26$practit,
+      _practData$26$practit2,
+      _practData$26$practit3,
       _practData$27,
+      _practData$27$practit,
+      _practData$27$practit2,
       _practData$28,
-      _practData$28$photo,
-      _practData$28$photo$,
+      _practData$29,
+      _practData$30,
+      _practData$30$photo,
+      _practData$30$photo$,
+      _practData$31,
+      _practData$31$biograp,
+      _practData$31$biograp2,
+      _practData$32,
+      _practData$33,
+      _practData$33$practit,
+      _practData$33$practit2,
+      _practData$33$practit3,
+      _practData$33$practit4,
+      _practData$33$practit5,
+      _practData$33$practit6,
       languages,
       gender,
       designation,
@@ -11087,6 +11280,32 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
 
         case 20:
           resp = _context4.sent;
+          _context4.next = 23;
+          return getCurrentPosition();
+
+        case 23:
+          _yield$getCurrentPosi = _context4.sent;
+          myLat = _yield$getCurrentPosi.lat;
+          myLong = _yield$getCurrentPosi["long"];
+          locationInfo = {};
+          city = ((_practData$2 = practData[0]) === null || _practData$2 === void 0 ? void 0 : (_practData$2$practiti = _practData$2.practitioner_role) === null || _practData$2$practiti === void 0 ? void 0 : (_practData$2$practiti2 = _practData$2$practiti[0]) === null || _practData$2$practiti2 === void 0 ? void 0 : (_practData$2$practiti3 = _practData$2$practiti2.OrgID) === null || _practData$2$practiti3 === void 0 ? void 0 : (_practData$2$practiti4 = _practData$2$practiti3.address) === null || _practData$2$practiti4 === void 0 ? void 0 : (_practData$2$practiti5 = _practData$2$practiti4[0]) === null || _practData$2$practiti5 === void 0 ? void 0 : (_practData$2$practiti6 = _practData$2$practiti5.city) === null || _practData$2$practiti6 === void 0 ? void 0 : _practData$2$practiti6.geogLevelName) || "";
+          kms = "0 kms";
+
+          if (!(myLat && myLong && city)) {
+            _context4.next = 33;
+            break;
+          }
+
+          _context4.next = 32;
+          return getLocationInfo$1({
+            lat: myLat,
+            "long": myLong
+          }, city, locationInfo);
+
+        case 32:
+          kms = locationInfo[city] || "0 kms";
+
+        case 33:
           data = (resp === null || resp === void 0 ? void 0 : (_resp$result = resp.result) === null || _resp$result === void 0 ? void 0 : _resp$result[0]) || {};
           slots = (data === null || data === void 0 ? void 0 : data.slots) || [];
           resourceInfo = {
@@ -11132,22 +11351,22 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
           if (Array.isArray(practData)) {
             if (isClinic) {
               info["locationId"] = id[0];
-              info["name"] = ((_practData$2 = practData[0]) === null || _practData$2 === void 0 ? void 0 : _practData$2.shortdesc) || "";
-              info["hospitalName"] = ((_practData$3 = practData[0]) === null || _practData$3 === void 0 ? void 0 : (_practData$3$Organiza = _practData$3.Organization) === null || _practData$3$Organiza === void 0 ? void 0 : (_practData$3$Organiza2 = _practData$3$Organiza[0]) === null || _practData$3$Organiza2 === void 0 ? void 0 : _practData$3$Organiza2.name) || "";
-              info["hospitalLocation"] = ((_practData$4 = practData[0]) === null || _practData$4 === void 0 ? void 0 : (_practData$4$Organiza = _practData$4.Organization) === null || _practData$4$Organiza === void 0 ? void 0 : (_practData$4$Organiza2 = _practData$4$Organiza.address) === null || _practData$4$Organiza2 === void 0 ? void 0 : (_practData$4$Organiza3 = _practData$4$Organiza2[0]) === null || _practData$4$Organiza3 === void 0 ? void 0 : _practData$4$Organiza3.line) || "";
-              info["title"] = ((_practData$5 = practData[0]) === null || _practData$5 === void 0 ? void 0 : (_practData$5$Organiza = _practData$5.Organization) === null || _practData$5$Organiza === void 0 ? void 0 : (_practData$5$Organiza2 = _practData$5$Organiza.address) === null || _practData$5$Organiza2 === void 0 ? void 0 : (_practData$5$Organiza3 = _practData$5$Organiza2[0]) === null || _practData$5$Organiza3 === void 0 ? void 0 : _practData$5$Organiza3.line) || "";
-              info["kms"] = "0kms";
-              info["orgId"] = (_practData$6 = practData[0]) === null || _practData$6 === void 0 ? void 0 : (_practData$6$Organiza = _practData$6.Organization) === null || _practData$6$Organiza === void 0 ? void 0 : _practData$6$Organiza.id;
-              info["org_Id"] = (_practData$7 = practData[0]) === null || _practData$7 === void 0 ? void 0 : (_practData$7$Organiza = _practData$7.Organization) === null || _practData$7$Organiza === void 0 ? void 0 : _practData$7$Organiza._id;
-              info["clinicId"] = (_practData$8 = practData[0]) === null || _practData$8 === void 0 ? void 0 : _practData$8.id;
-              info["id"] = (_practData$9 = practData[0]) === null || _practData$9 === void 0 ? void 0 : _practData$9.id;
-              info["_id"] = (_practData$10 = practData[0]) === null || _practData$10 === void 0 ? void 0 : _practData$10._id;
-              info["_key"] = (_practData$11 = practData[0]) === null || _practData$11 === void 0 ? void 0 : _practData$11._key;
-              info["img"] = getImgUrl((_practData$12 = practData[0]) === null || _practData$12 === void 0 ? void 0 : (_practData$12$photo = _practData$12.photo) === null || _practData$12$photo === void 0 ? void 0 : (_practData$12$photo$ = _practData$12$photo[0]) === null || _practData$12$photo$ === void 0 ? void 0 : _practData$12$photo$.fileid);
+              info["name"] = ((_practData$3 = practData[0]) === null || _practData$3 === void 0 ? void 0 : _practData$3.shortdesc) || "";
+              info["hospitalName"] = ((_practData$4 = practData[0]) === null || _practData$4 === void 0 ? void 0 : (_practData$4$Organiza = _practData$4.Organization) === null || _practData$4$Organiza === void 0 ? void 0 : (_practData$4$Organiza2 = _practData$4$Organiza[0]) === null || _practData$4$Organiza2 === void 0 ? void 0 : _practData$4$Organiza2.name) || "";
+              info["hospitalLocation"] = ((_practData$5 = practData[0]) === null || _practData$5 === void 0 ? void 0 : (_practData$5$Organiza = _practData$5.Organization) === null || _practData$5$Organiza === void 0 ? void 0 : (_practData$5$Organiza2 = _practData$5$Organiza.address) === null || _practData$5$Organiza2 === void 0 ? void 0 : (_practData$5$Organiza3 = _practData$5$Organiza2[0]) === null || _practData$5$Organiza3 === void 0 ? void 0 : _practData$5$Organiza3.line) || "";
+              info["title"] = ((_practData$6 = practData[0]) === null || _practData$6 === void 0 ? void 0 : (_practData$6$Organiza = _practData$6.Organization) === null || _practData$6$Organiza === void 0 ? void 0 : (_practData$6$Organiza2 = _practData$6$Organiza.address) === null || _practData$6$Organiza2 === void 0 ? void 0 : (_practData$6$Organiza3 = _practData$6$Organiza2[0]) === null || _practData$6$Organiza3 === void 0 ? void 0 : _practData$6$Organiza3.line) || "";
+              info["kms"] = kms;
+              info["orgId"] = (_practData$7 = practData[0]) === null || _practData$7 === void 0 ? void 0 : (_practData$7$Organiza = _practData$7.Organization) === null || _practData$7$Organiza === void 0 ? void 0 : _practData$7$Organiza.id;
+              info["org_Id"] = (_practData$8 = practData[0]) === null || _practData$8 === void 0 ? void 0 : (_practData$8$Organiza = _practData$8.Organization) === null || _practData$8$Organiza === void 0 ? void 0 : _practData$8$Organiza._id;
+              info["clinicId"] = (_practData$9 = practData[0]) === null || _practData$9 === void 0 ? void 0 : _practData$9.id;
+              info["id"] = (_practData$10 = practData[0]) === null || _practData$10 === void 0 ? void 0 : _practData$10.id;
+              info["_id"] = (_practData$11 = practData[0]) === null || _practData$11 === void 0 ? void 0 : _practData$11._id;
+              info["_key"] = (_practData$12 = practData[0]) === null || _practData$12 === void 0 ? void 0 : _practData$12._key;
+              info["img"] = getImgUrl((_practData$13 = practData[0]) === null || _practData$13 === void 0 ? void 0 : (_practData$13$photo = _practData$13.photo) === null || _practData$13$photo === void 0 ? void 0 : (_practData$13$photo$ = _practData$13$photo[0]) === null || _practData$13$photo$ === void 0 ? void 0 : _practData$13$photo$.fileid);
             } else {
-              info["orgId"] = (_practData$13 = practData[0]) === null || _practData$13 === void 0 ? void 0 : (_practData$13$practit = _practData$13.practitioner_role) === null || _practData$13$practit === void 0 ? void 0 : (_practData$13$practit2 = _practData$13$practit[0]) === null || _practData$13$practit2 === void 0 ? void 0 : (_practData$13$practit3 = _practData$13$practit2.OrgID) === null || _practData$13$practit3 === void 0 ? void 0 : _practData$13$practit3.id;
+              info["orgId"] = (_practData$14 = practData[0]) === null || _practData$14 === void 0 ? void 0 : (_practData$14$practit = _practData$14.practitioner_role) === null || _practData$14$practit === void 0 ? void 0 : (_practData$14$practit2 = _practData$14$practit[0]) === null || _practData$14$practit2 === void 0 ? void 0 : (_practData$14$practit3 = _practData$14$practit2.OrgID) === null || _practData$14$practit3 === void 0 ? void 0 : _practData$14$practit3.id;
               languages = new Set();
-              (_practData$14 = practData[0]) === null || _practData$14 === void 0 ? void 0 : (_practData$14$communi = _practData$14.communication) === null || _practData$14$communi === void 0 ? void 0 : _practData$14$communi.forEach(function (c) {
+              (_practData$15 = practData[0]) === null || _practData$15 === void 0 ? void 0 : (_practData$15$communi = _practData$15.communication) === null || _practData$15$communi === void 0 ? void 0 : _practData$15$communi.forEach(function (c) {
                 var _c$Type;
 
                 if ((c === null || c === void 0 ? void 0 : (_c$Type = c.Type) === null || _c$Type === void 0 ? void 0 : _c$Type.toLowerCase()) === "language") {
@@ -11160,39 +11379,47 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
                   }
                 }
               });
-              info["id"] = (_practData$15 = practData[0]) === null || _practData$15 === void 0 ? void 0 : _practData$15["id"];
-              gender = ((_practData$16 = practData[0]) === null || _practData$16 === void 0 ? void 0 : (_practData$16$gender = _practData$16.gender) === null || _practData$16$gender === void 0 ? void 0 : (_practData$16$gender$ = _practData$16$gender.coding) === null || _practData$16$gender$ === void 0 ? void 0 : (_practData$16$gender$2 = _practData$16$gender$[0]) === null || _practData$16$gender$2 === void 0 ? void 0 : _practData$16$gender$2.display) || "";
+              info["id"] = (_practData$16 = practData[0]) === null || _practData$16 === void 0 ? void 0 : _practData$16["id"];
+              gender = ((_practData$17 = practData[0]) === null || _practData$17 === void 0 ? void 0 : (_practData$17$gender = _practData$17.gender) === null || _practData$17$gender === void 0 ? void 0 : (_practData$17$gender$ = _practData$17$gender[0]) === null || _practData$17$gender$ === void 0 ? void 0 : (_practData$17$gender$2 = _practData$17$gender$.coding) === null || _practData$17$gender$2 === void 0 ? void 0 : (_practData$17$gender$3 = _practData$17$gender$2[0]) === null || _practData$17$gender$3 === void 0 ? void 0 : _practData$17$gender$3.display) || "";
               designation = "";
-              (_ref9 = [((_practData$17 = practData[0]) === null || _practData$17 === void 0 ? void 0 : _practData$17.position) || []]) === null || _ref9 === void 0 ? void 0 : (_ref9$forEach = _ref9.forEach) === null || _ref9$forEach === void 0 ? void 0 : _ref9$forEach.call(_ref9, function (s) {
-                var val = s === null || s === void 0 ? void 0 : s.coding;
+              (_ref9 = [(practData === null || practData === void 0 ? void 0 : (_practData$18 = practData[0]) === null || _practData$18 === void 0 ? void 0 : (_practData$18$practit = _practData$18.practitioner_role) === null || _practData$18$practit === void 0 ? void 0 : (_practData$18$practit2 = _practData$18$practit[0]) === null || _practData$18$practit2 === void 0 ? void 0 : _practData$18$practit2.SpecialtyID) || {}]) === null || _ref9 === void 0 ? void 0 : _ref9.forEach(function (s) {
+                var _s$coding;
 
-                if (val === null || val === void 0 ? void 0 : val.display) {
-                  if (designation) {
-                    designation += ", ";
-                  }
+                s === null || s === void 0 ? void 0 : (_s$coding = s.coding) === null || _s$coding === void 0 ? void 0 : _s$coding.forEach(function (val) {
+                  if (val === null || val === void 0 ? void 0 : val.display) {
+                    if (designation) {
+                      designation += ', ';
+                    }
 
-                  designation += val === null || val === void 0 ? void 0 : val.display;
-                  info.specialities.push({
-                    label: val === null || val === void 0 ? void 0 : val.display,
-                    id: s === null || s === void 0 ? void 0 : s.id
-                  });
-                }
+                    designation += val === null || val === void 0 ? void 0 : val.display;
+                    info.specialities.push({
+                      label: val === null || val === void 0 ? void 0 : val.display,
+                      id: s === null || s === void 0 ? void 0 : s.id
+                    });
+                  }
+                });
               });
+              info["role"] = (_practData$19 = practData[0]) === null || _practData$19 === void 0 ? void 0 : (_practData$19$practit = _practData$19.practitioner_role) === null || _practData$19$practit === void 0 ? void 0 : (_practData$19$practit2 = _practData$19$practit[0]) === null || _practData$19$practit2 === void 0 ? void 0 : (_practData$19$practit3 = _practData$19$practit2.role) === null || _practData$19$practit3 === void 0 ? void 0 : (_practData$19$practit4 = _practData$19$practit3[0]) === null || _practData$19$practit4 === void 0 ? void 0 : (_practData$19$practit5 = _practData$19$practit4.coding) === null || _practData$19$practit5 === void 0 ? void 0 : (_practData$19$practit6 = _practData$19$practit5[0]) === null || _practData$19$practit6 === void 0 ? void 0 : _practData$19$practit6.display;
+              info["mobile"] = (_practData$20 = practData[0]) === null || _practData$20 === void 0 ? void 0 : (_practData$20$contact = _practData$20.contact) === null || _practData$20$contact === void 0 ? void 0 : (_practData$20$contact2 = _practData$20$contact[0]) === null || _practData$20$contact2 === void 0 ? void 0 : (_practData$20$contact3 = _practData$20$contact2.telecom) === null || _practData$20$contact3 === void 0 ? void 0 : (_practData$20$contact4 = _practData$20$contact3[0]) === null || _practData$20$contact4 === void 0 ? void 0 : _practData$20$contact4.value;
               info["title"] = "".concat(gender).concat(gender && " | ").concat(designation);
-              info["subtext"] = ((_practData$18 = practData[0]) === null || _practData$18 === void 0 ? void 0 : (_practData$18$qualifi = _practData$18.qualification) === null || _practData$18$qualifi === void 0 ? void 0 : (_practData$18$qualifi2 = _practData$18$qualifi.map(function (q) {
+              info["gender"] = gender;
+              info["subtext"] = ((_practData$21 = practData[0]) === null || _practData$21 === void 0 ? void 0 : (_practData$21$qualifi = _practData$21.qualification) === null || _practData$21$qualifi === void 0 ? void 0 : (_practData$21$qualifi2 = _practData$21$qualifi.map(function (q) {
                 return (q === null || q === void 0 ? void 0 : q.name) || "";
-              })) === null || _practData$18$qualifi2 === void 0 ? void 0 : _practData$18$qualifi2.join(", ")) || "MBBS";
+              })) === null || _practData$21$qualifi2 === void 0 ? void 0 : _practData$21$qualifi2.join(", ")) || "MBBS";
               info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
-              info["hospitalName"] = ((_practData$19 = practData[0]) === null || _practData$19 === void 0 ? void 0 : (_practData$19$practit = _practData$19.practitioner_role) === null || _practData$19$practit === void 0 ? void 0 : (_practData$19$practit2 = _practData$19$practit[0]) === null || _practData$19$practit2 === void 0 ? void 0 : (_practData$19$practit3 = _practData$19$practit2.OrgID) === null || _practData$19$practit3 === void 0 ? void 0 : _practData$19$practit3.name) || "";
-              info["hospitalLocation"] = ((_practData$20 = practData[0]) === null || _practData$20 === void 0 ? void 0 : (_practData$20$address = _practData$20.address) === null || _practData$20$address === void 0 ? void 0 : (_practData$20$address2 = _practData$20$address[0]) === null || _practData$20$address2 === void 0 ? void 0 : _practData$20$address2.line) || "";
-              nameObj = ((_practData$21 = practData[0]) === null || _practData$21 === void 0 ? void 0 : (_practData$21$name = _practData$21.name) === null || _practData$21$name === void 0 ? void 0 : _practData$21$name[0]) || {};
+              info["hospitalName"] = ((_practData$22 = practData[0]) === null || _practData$22 === void 0 ? void 0 : (_practData$22$practit = _practData$22.practitioner_role) === null || _practData$22$practit === void 0 ? void 0 : (_practData$22$practit2 = _practData$22$practit[0]) === null || _practData$22$practit2 === void 0 ? void 0 : (_practData$22$practit3 = _practData$22$practit2.OrgID) === null || _practData$22$practit3 === void 0 ? void 0 : _practData$22$practit3.name) || "";
+              info["hospitalLocation"] = ((_practData$23 = practData[0]) === null || _practData$23 === void 0 ? void 0 : (_practData$23$address = _practData$23.address) === null || _practData$23$address === void 0 ? void 0 : (_practData$23$address2 = _practData$23$address[0]) === null || _practData$23$address2 === void 0 ? void 0 : _practData$23$address2.line) || "";
+              nameObj = ((_practData$24 = practData[0]) === null || _practData$24 === void 0 ? void 0 : (_practData$24$name = _practData$24.name) === null || _practData$24$name === void 0 ? void 0 : _practData$24$name[0]) || {};
               info["name"] = makeName(nameObj);
-              info["kms"] = ((_practData$22 = practData[0]) === null || _practData$22 === void 0 ? void 0 : (_practData$22$address = _practData$22.address) === null || _practData$22$address === void 0 ? void 0 : (_practData$22$address2 = _practData$22$address[0]) === null || _practData$22$address2 === void 0 ? void 0 : _practData$22$address2.distance) ? "".concat(practData[0].address[0].distance) : "0kms";
-              info["orgType"] = (_practData$23 = practData[0]) === null || _practData$23 === void 0 ? void 0 : (_practData$23$practit = _practData$23.practitioner_role) === null || _practData$23$practit === void 0 ? void 0 : (_practData$23$practit2 = _practData$23$practit[0]) === null || _practData$23$practit2 === void 0 ? void 0 : (_practData$23$practit3 = _practData$23$practit2.OrgID) === null || _practData$23$practit3 === void 0 ? void 0 : (_practData$23$practit4 = _practData$23$practit3.OrgType) === null || _practData$23$practit4 === void 0 ? void 0 : _practData$23$practit4[0];
-              info["org_Id"] = (_practData$0$practiti = (_practData$24 = practData[0]) === null || _practData$24 === void 0 ? void 0 : (_practData$24$practit = _practData$24.practitioner_role) === null || _practData$24$practit === void 0 ? void 0 : (_practData$24$practit2 = _practData$24$practit[0]) === null || _practData$24$practit2 === void 0 ? void 0 : (_practData$24$practit3 = _practData$24$practit2.OrgID) === null || _practData$24$practit3 === void 0 ? void 0 : _practData$24$practit3._id) !== null && _practData$0$practiti !== void 0 ? _practData$0$practiti : (_practData$25 = practData[0]) === null || _practData$25 === void 0 ? void 0 : (_practData$25$practit = _practData$25.practitioner_role) === null || _practData$25$practit === void 0 ? void 0 : (_practData$25$practit2 = _practData$25$practit[0]) === null || _practData$25$practit2 === void 0 ? void 0 : _practData$25$practit2.EntityName;
-              info["_id"] = (_practData$26 = practData[0]) === null || _practData$26 === void 0 ? void 0 : _practData$26._id;
-              info["_key"] = (_practData$27 = practData[0]) === null || _practData$27 === void 0 ? void 0 : _practData$27._key;
-              info["img"] = getImgUrl((_practData$28 = practData[0]) === null || _practData$28 === void 0 ? void 0 : (_practData$28$photo = _practData$28.photo) === null || _practData$28$photo === void 0 ? void 0 : (_practData$28$photo$ = _practData$28$photo[0]) === null || _practData$28$photo$ === void 0 ? void 0 : _practData$28$photo$.fileid);
+              info["kms"] = kms;
+              info["orgType"] = (_practData$25 = practData[0]) === null || _practData$25 === void 0 ? void 0 : (_practData$25$practit = _practData$25.practitioner_role) === null || _practData$25$practit === void 0 ? void 0 : (_practData$25$practit2 = _practData$25$practit[0]) === null || _practData$25$practit2 === void 0 ? void 0 : (_practData$25$practit3 = _practData$25$practit2.OrgID) === null || _practData$25$practit3 === void 0 ? void 0 : (_practData$25$practit4 = _practData$25$practit3.OrgType) === null || _practData$25$practit4 === void 0 ? void 0 : _practData$25$practit4[0];
+              info["org_Id"] = (_practData$0$practiti = (_practData$26 = practData[0]) === null || _practData$26 === void 0 ? void 0 : (_practData$26$practit = _practData$26.practitioner_role) === null || _practData$26$practit === void 0 ? void 0 : (_practData$26$practit2 = _practData$26$practit[0]) === null || _practData$26$practit2 === void 0 ? void 0 : (_practData$26$practit3 = _practData$26$practit2.OrgID) === null || _practData$26$practit3 === void 0 ? void 0 : _practData$26$practit3._id) !== null && _practData$0$practiti !== void 0 ? _practData$0$practiti : (_practData$27 = practData[0]) === null || _practData$27 === void 0 ? void 0 : (_practData$27$practit = _practData$27.practitioner_role) === null || _practData$27$practit === void 0 ? void 0 : (_practData$27$practit2 = _practData$27$practit[0]) === null || _practData$27$practit2 === void 0 ? void 0 : _practData$27$practit2.EntityName;
+              info["_id"] = (_practData$28 = practData[0]) === null || _practData$28 === void 0 ? void 0 : _practData$28._id;
+              info["_key"] = (_practData$29 = practData[0]) === null || _practData$29 === void 0 ? void 0 : _practData$29._key;
+              info["img"] = getImgUrl((_practData$30 = practData[0]) === null || _practData$30 === void 0 ? void 0 : (_practData$30$photo = _practData$30.photo) === null || _practData$30$photo === void 0 ? void 0 : (_practData$30$photo$ = _practData$30$photo[0]) === null || _practData$30$photo$ === void 0 ? void 0 : _practData$30$photo$.fileid);
+              info["bio"] = ((_practData$31 = practData[0]) === null || _practData$31 === void 0 ? void 0 : (_practData$31$biograp = _practData$31.biography) === null || _practData$31$biograp === void 0 ? void 0 : (_practData$31$biograp2 = _practData$31$biograp[0]) === null || _practData$31$biograp2 === void 0 ? void 0 : _practData$31$biograp2.biography_description) || '';
+              info["experience"] = calculationExp((_practData$32 = practData[0]) === null || _practData$32 === void 0 ? void 0 : _practData$32.job_experience);
+              info["hospitalLocation"] = ((_practData$33 = practData[0]) === null || _practData$33 === void 0 ? void 0 : (_practData$33$practit = _practData$33.practitioner_role) === null || _practData$33$practit === void 0 ? void 0 : (_practData$33$practit2 = _practData$33$practit[0]) === null || _practData$33$practit2 === void 0 ? void 0 : (_practData$33$practit3 = _practData$33$practit2.OrgID) === null || _practData$33$practit3 === void 0 ? void 0 : (_practData$33$practit4 = _practData$33$practit3.address) === null || _practData$33$practit4 === void 0 ? void 0 : (_practData$33$practit5 = _practData$33$practit4[0]) === null || _practData$33$practit5 === void 0 ? void 0 : (_practData$33$practit6 = _practData$33$practit5.city) === null || _practData$33$practit6 === void 0 ? void 0 : _practData$33$practit6.geogLevelName) || "";
             }
           }
 
@@ -11200,19 +11427,19 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
             data: [info]
           }));
 
-        case 30:
-          _context4.prev = 30;
+        case 42:
+          _context4.prev = 42;
           _context4.t0 = _context4["catch"](2);
           return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context4.t0.message
           })));
 
-        case 33:
+        case 45:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[2, 30]]);
+  }, _callee4, null, [[2, 42]]);
 }))); // end
 // APPOINTMENT_READ
 
@@ -13739,94 +13966,9 @@ var practitionerReducer$1 = practitionerReducer.reducer;
 
 var _extraReducers$y;
 
-var getLocationInfo$1 = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(myLocation, city) {
-    var obj,
-        lat,
-        _long,
-        info,
-        _args = arguments;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            obj = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
-
-            if (obj[city]) {
-              _context.next = 7;
-              break;
-            }
-
-            lat = myLocation.lat, _long = myLocation["long"];
-            _context.next = 5;
-            return getLatLong(city);
-
-          case 5:
-            info = _context.sent;
-
-            if (info.lat && info["long"]) {
-              obj[city] = getDisctanceFromLatLonInKm(info.lat, info["long"], lat, _long);
-            }
-
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getLocationInfo(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var calculationExp = function calculationExp(jexp) {
-  var expInMs = 0;
-  jexp.forEach(function () {
-    var exp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var start_date = exp.start_date,
-        end_date = exp.end_date;
-
-    if (typeof start_date === "number") {
-      if (typeof end_date === "number") {
-        if (start_date < end_date) {
-          expInMs += (end_date - start_date) * 1000;
-        }
-      } else {
-        expInMs += (Date.now() - start_date) * 1000;
-      }
-    }
-  });
-  var expInDays = moment(expInMs).diff(moment(0), "days");
-  var expInMonths = moment(expInMs).diff(moment(0), "months");
-  var expInYears = moment(expInMs).diff(moment(0), "years");
-
-  if (expInYears >= 1) {
-    var value = Math.floor(expInYears);
-    return "".concat(value, " year") + (value > 1 ? "s" : "");
-  }
-
-  if (expInMonths >= 1) {
-    var _value = Math.floor(expInMonths);
-
-    return "".concat(_value, " month") + (_value > 1 ? "s" : "");
-  }
-
-  if (expInDays >= 1) {
-    var _value2 = Math.floor(expInDays);
-
-    return "".concat(_value2, " day") + (_value2 > 1 ? "s" : "");
-  }
-
-  return "0 days";
-}; // DOCTER_LISTING
-
-
-var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
-      _ref3,
+      _ref2,
       rejectWithValue,
       Sdate,
       Edate,
@@ -13854,15 +13996,15 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
       myLong,
       locationInfo,
       promArr,
-      _args2 = arguments;
+      _args = arguments;
 
-  return regeneratorRuntime.wrap(function _callee2$(_context2) {
+  return regeneratorRuntime.wrap(function _callee$(_context) {
     while (1) {
-      switch (_context2.prev = _context2.next) {
+      switch (_context.prev = _context.next) {
         case 0:
-          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-          _ref3 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref3.rejectWithValue;
-          _context2.prev = 2;
+          payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
+          _context.prev = 2;
           Sdate = new Date();
           Edate = new Date();
 
@@ -13899,8 +14041,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
               "filter": {
                 "org_id": hospital,
                 "practionerId": doctorId,
-                "startdate": getUtcTime(startTime),
-                "enddate": getUtcTime(endTime)
+                "startdate": getUtcTime(startDate),
+                "enddate": getUtcTime(endDate)
               }
             };
           } // body = {
@@ -13917,13 +14059,13 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           // }
 
 
-          _context2.next = 15;
+          _context.next = 15;
           return fetchData$3({
             body: JSON.stringify(body)
           });
 
         case 15:
-          data = _context2.sent;
+          data = _context.sent;
           returnData = [];
           allLangs = new Set();
           allCities = new Set();
@@ -14072,7 +14214,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$practitione, _restData$practitione2, _restData$practitione3, _restData$practitione4, _restData$practitione5, _restData$hospital6, _restData$hospital6$t, _restData$hospital6$t2, _restData$hospital7, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital8, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$, _restData$biography, _restData$biography$;
+                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$practitione, _restData$practitione2, _restData$practitione3, _restData$practitione4, _restData$practitione5, _restData$hospital6, _restData$hospital6$c, _restData$hospital6$c2, _restData$hospital6$c3, _restData$hospital6$c4, _restData$hospital7, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital8, _restData$hospital9, _restData$hospital9$a, _restData$hospital9$a2, _restData$name, _restData$photo, _restData$photo$, _restData$address5, _restData$address5$, _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) || "";
 
@@ -14112,7 +14254,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                       }
                     });
                     info["role"] = restData === null || restData === void 0 ? void 0 : (_restData$practitione = restData.practitioner_role) === null || _restData$practitione === void 0 ? void 0 : (_restData$practitione2 = _restData$practitione[0]) === null || _restData$practitione2 === void 0 ? void 0 : (_restData$practitione3 = _restData$practitione2.role) === null || _restData$practitione3 === void 0 ? void 0 : (_restData$practitione4 = _restData$practitione3.coding) === null || _restData$practitione4 === void 0 ? void 0 : (_restData$practitione5 = _restData$practitione4[0]) === null || _restData$practitione5 === void 0 ? void 0 : _restData$practitione5.display;
-                    info["mobile"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : (_restData$hospital6$t = _restData$hospital6.telecom) === null || _restData$hospital6$t === void 0 ? void 0 : (_restData$hospital6$t2 = _restData$hospital6$t[0]) === null || _restData$hospital6$t2 === void 0 ? void 0 : _restData$hospital6$t2.value;
+                    info["mobile"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : (_restData$hospital6$c = _restData$hospital6.contact) === null || _restData$hospital6$c === void 0 ? void 0 : (_restData$hospital6$c2 = _restData$hospital6$c[0]) === null || _restData$hospital6$c2 === void 0 ? void 0 : (_restData$hospital6$c3 = _restData$hospital6$c2.telecom) === null || _restData$hospital6$c3 === void 0 ? void 0 : (_restData$hospital6$c4 = _restData$hospital6$c3[0]) === null || _restData$hospital6$c4 === void 0 ? void 0 : _restData$hospital6$c4.value;
                     info["experience"] = calculationExp(restData === null || restData === void 0 ? void 0 : restData.job_experience);
                     info["title"] = "".concat(_gender).concat(_gender && " | ").concat(designation);
                     info["gender"] = _gender;
@@ -14122,11 +14264,11 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     })) === 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$hospital8 = restData.hospital) === null || _restData$hospital8 === void 0 ? void 0 : _restData$hospital8.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) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital9 = restData.hospital) === null || _restData$hospital9 === void 0 ? void 0 : (_restData$hospital9$a = _restData$hospital9.address) === null || _restData$hospital9$a === void 0 ? void 0 : (_restData$hospital9$a2 = _restData$hospital9$a.city) === null || _restData$hospital9$a2 === void 0 ? void 0 : _restData$hospital9$a2.geogLevelName) || "";
                     var nameObj = (restData === null || restData === void 0 ? void 0 : (_restData$name = restData.name) === null || _restData$name === void 0 ? void 0 : _restData$name[0]) || {};
                     info["name"] = makeName(nameObj);
                     info["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["kms"] = (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$.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) || "";
                   }
@@ -14137,17 +14279,17 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
             });
           }
 
-          _context2.next = 22;
+          _context.next = 22;
           return getCurrentPosition();
 
         case 22:
-          _yield$getCurrentPosi = _context2.sent;
+          _yield$getCurrentPosi = _context.sent;
           myLat = _yield$getCurrentPosi.lat;
           myLong = _yield$getCurrentPosi["long"];
           locationInfo = {};
 
           if (!(myLat && myLong)) {
-            _context2.next = 31;
+            _context.next = 31;
             break;
           }
 
@@ -14159,7 +14301,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
               "long": myLong
             }, city, locationInfo);
           });
-          _context2.next = 30;
+          _context.next = 30;
           return es6Promise.Promise.all(promArr);
 
         case 30:
@@ -14168,56 +14310,56 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           });
 
         case 31:
-          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData,
             allLangs: _toConsumableArray(allLangs)
           }));
 
         case 34:
-          _context2.prev = 34;
-          _context2.t0 = _context2["catch"](2);
-          console.log(_context2.t0);
-          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context2.t0.message
+          _context.prev = 34;
+          _context.t0 = _context["catch"](2);
+          console.log(_context.t0);
+          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context.t0.message
           })));
 
         case 38:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
     }
-  }, _callee2, null, [[2, 34]]);
+  }, _callee, null, [[2, 34]]);
 }))); // end
 
-var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,
-      _ref5,
+      _ref4,
       rejectWithValue,
       body,
       data,
       returnData,
-      _args3 = arguments;
+      _args2 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
     while (1) {
-      switch (_context3.prev = _context3.next) {
+      switch (_context2.prev = _context2.next) {
         case 0:
-          payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-          _ref5 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref5.rejectWithValue;
-          _context3.prev = 2;
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
+          _context2.prev = 2;
           body = {
             db_name: dbName,
             entity: "CodeableConceptMaster",
             filter: "CodeableConceptMaster.Type == 'LANGUAGE'",
             return_fields: "{coding_id: CodeableConceptMaster._id, codeable: (let codeable = DOCUMENT(CodeableConceptMaster.coding[0]) RETURN codeable)[0]}"
           };
-          _context3.next = 6;
+          _context2.next = 6;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 6:
-          data = _context3.sent;
+          data = _context2.sent;
           returnData = [];
 
           if (data.result && Array.isArray(data.result)) {
@@ -14231,24 +14373,24 @@ var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__P
             });
           }
 
-          return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnData
           }));
 
         case 12:
-          _context3.prev = 12;
-          _context3.t0 = _context3["catch"](2);
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](2);
           console.log(error);
-          return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: error.message
           })));
 
         case 16:
         case "end":
-          return _context3.stop();
+          return _context2.stop();
       }
     }
-  }, _callee3, null, [[2, 12]]);
+  }, _callee2, null, [[2, 12]]);
 }))); // FUZZY SEARCH CREATE INITIALSTATE
 
 var docterListingReducer = createSlice({
@@ -15082,7 +15224,9 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
           body = {
             db_name: dbName,
             entity: "Practitioner",
-            return_fields: "MERGE(Practitioner,{name:(FOR cod IN TO_ARRAY(Practitioner.name) RETURN DOCUMENT(cod)),SPECIALTY:(FOR spec IN TO_ARRAY(Practitioner.practitioner_role) FOR speccod IN TO_ARRAY( DOCUMENT(spec).SpecialtyID) RETURN MERGE(DOCUMENT(speccod),{coding:(FOR cod IN DOCUMENT(speccod).coding RETURN DOCUMENT(cod))})) })"
+            filter: "Practitioner.activestatus == true && Practitioner.status == true",
+            return_fields: "merge(Practitioner,{name:(for hm in HumanNameMaster filter hm._id in Practitioner.name return merge(hm,{use:(for cod in CodeableConceptMaster filter cod._id== hm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == hm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == hm.suffix return document(cod.coding))}))},{SPECIALTY:(for PractitionerRole in PractitionerRole filter Practitioner.practitioner_role any == PractitionerRole._id for CodeableConceptMaster in CodeableConceptMaster filter PractitionerRole.SpecialtyID == CodeableConceptMaster._id return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}) ) } )",
+            sort: "first(document(Practitioner.name)[*].text)"
           };
           _context11.next = 6;
           return fetchData$3({
@@ -15095,12 +15239,12 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
 
           if (Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
             data === null || data === void 0 ? void 0 : data.result.forEach(function (spec) {
-              var _spec$name, _spec$name$, _spec$SPECIALTY, _spec$SPECIALTY$, _spec$SPECIALTY$$codi, _spec$SPECIALTY$$codi2;
+              var _spec$name, _spec$SPECIALTY, _spec$SPECIALTY$, _spec$SPECIALTY$$codi, _spec$SPECIALTY$$codi2;
 
               returnData.push({
-                label: (_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : (_spec$name$ = _spec$name[0]) === null || _spec$name$ === void 0 ? void 0 : _spec$name$.text,
+                label: makeName((_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : _spec$name[0]),
                 value: spec.id,
-                type: 'Doctor',
+                type: "Doctor",
                 speciality: spec === null || spec === void 0 ? void 0 : (_spec$SPECIALTY = spec.SPECIALTY) === null || _spec$SPECIALTY === void 0 ? void 0 : (_spec$SPECIALTY$ = _spec$SPECIALTY[0]) === null || _spec$SPECIALTY$ === void 0 ? void 0 : (_spec$SPECIALTY$$codi = _spec$SPECIALTY$.coding) === null || _spec$SPECIALTY$$codi === void 0 ? void 0 : (_spec$SPECIALTY$$codi2 = _spec$SPECIALTY$$codi[0]) === null || _spec$SPECIALTY$$codi2 === void 0 ? void 0 : _spec$SPECIALTY$$codi2.display
               });
             });
@@ -16349,6 +16493,8 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
       firstName,
       _payload$lastName,
       lastName,
+      _payload$middleName,
+      middleName,
       _payload$gender,
       gender,
       _payload$email,
@@ -16366,7 +16512,7 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          _payload$phone = payload.phone, phone = _payload$phone === void 0 ? "" : _payload$phone, _payload$dob = payload.dob, dob = _payload$dob === void 0 ? "" : _payload$dob, _payload$firstName = payload.firstName, firstName = _payload$firstName === void 0 ? "" : _payload$firstName, _payload$lastName = payload.lastName, lastName = _payload$lastName === void 0 ? "" : _payload$lastName, _payload$gender = payload.gender, gender = _payload$gender === void 0 ? "" : _payload$gender, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, photo = payload.photo;
+          _payload$phone = payload.phone, phone = _payload$phone === void 0 ? "" : _payload$phone, _payload$dob = payload.dob, dob = _payload$dob === void 0 ? "" : _payload$dob, _payload$firstName = payload.firstName, firstName = _payload$firstName === void 0 ? "" : _payload$firstName, _payload$lastName = payload.lastName, lastName = _payload$lastName === void 0 ? "" : _payload$lastName, _payload$middleName = payload.middleName, middleName = _payload$middleName === void 0 ? "" : _payload$middleName, _payload$gender = payload.gender, gender = _payload$gender === void 0 ? "" : _payload$gender, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, photo = payload.photo;
           imageInfo = [];
 
           if (photo) {
@@ -16405,7 +16551,7 @@ var UPSERT_PERSON = createAsyncThunk("personApiSlice/upsertPerson", /*#__PURE__*
                 use: "",
                 text: firstName,
                 family: lastName,
-                given: "",
+                given: middleName,
                 prefix: "",
                 suffix: "",
                 period: [{
@@ -16540,12 +16686,12 @@ var ADD_RELATED_PERSON = createAsyncThunk("personApiSlice/addRelatedPerson", /*#
               // true
               "relationship": relationType,
               "name": [{
-                "use": "string",
+                "use": "",
                 "text": firstName,
                 "family": lastName,
-                "given": firstName,
-                "prefix": gender.toLowerCase() === "male" ? "Mr" : "Mrs",
-                "suffix": "string",
+                "given": "",
+                "prefix": "",
+                "suffix": "",
                 "period": [{
                   "start": Math.floor(Date.now() / 1000),
                   "end": 0
@@ -18001,9 +18147,9 @@ var GET_PRACTITIONERS = createAsyncThunk("OrganizationRegisterPatientApiSlice/ge
           _payload$OrgID2 = payload.OrgID, OrgID = _payload$OrgID2 === void 0 ? "" : _payload$OrgID2;
           body = {
             db_name: "primarycare",
-            entity: "Practitioner_PractitionerRole_E",
-            filter: "DOCUMENT(Practitioner_PractitionerRole_E._to).SpecialtyID=='" + OrgID + "'",
-            return_fields: "MERGE( DOCUMENT(Practitioner_PractitionerRole_E._from),{name:DOCUMENT(DOCUMENT(Practitioner_PractitionerRole_E._from).name)}, {practitioner_role:(FOR role IN TO_ARRAY(DOCUMENT(Practitioner_PractitionerRole_E._from).practitioner_role) RETURN MERGE(DOCUMENT(role),{SpecialtyID:(FOR spec IN TO_ARRAY(DOCUMENT(role).SpecialtyID) RETURN MERGE(DOCUMENT(spec),{coding:(FOR cod IN DOCUMENT(spec).coding RETURN DOCUMENT(cod))}) ),role:MERGE(DOCUMENT(DOCUMENT(role).role),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(role).role).coding) RETURN DOCUMENT(cod) )}) }) )},{practitioner_type:DOCUMENT( DOCUMENT(DOCUMENT(Practitioner_PractitionerRole_E._from).practitioner_type).coding)})"
+            entity: "Practitioner",
+            filter: "document(Practitioner.practitioner_role)[*].SpecialtyID any == '" + OrgID + "'",
+            return_fields: "merge(Practitioner,{name:document(Practitioner.name)},{practitioner_role:(for PractitionerRole in PractitionerRole filter Practitioner.practitioner_role any == PractitionerRole._id return merge(PractitionerRole,{role:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == PractitionerRole.role return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))}, {SpecialtyID:(for CodeableConceptMaster in CodeableConceptMaster filter PractitionerRole.SpecialtyID == CodeableConceptMaster._id return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}) ) } ) )}, {practitioner_type:(for CodeableConceptMaster in CodeableConceptMaster filter CodeableConceptMaster._id == Practitioner.practitioner_type return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}))})"
           };
           _context9.next = 7;
           return fetchData$3({
@@ -18976,7 +19122,7 @@ var dashboardQuery = {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
           Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
-        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{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,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{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','practitioner_role','practitioner_type'),{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))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
+        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)}) ,Encounter:merge(keep(adqolcEncounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==adqolcEncounter.patient_id return merge(pat,{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,photo:document(pat.photo)})),status:document(adqolcEncounter.status)},{practitioner_details:(for pd in adqolcEncounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in adqolcEncounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{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))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(adqolcEncounter.reasonReference)},{participantHistory:(for phy in to_array (adqolcEncounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       },
       reassign: {
         db_name: dbName,
@@ -18985,7 +19131,7 @@ var dashboardQuery = {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
           Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
-        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{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,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{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','practitioner_role','practitioner_type'),{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))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
+        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)}) ,Encounter:merge(keep(adqolcEncounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==adqolcEncounter.patient_id return merge(pat,{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,photo:document(pat.photo)})),status:document(adqolcEncounter.status)},{practitioner_details:(for pd in adqolcEncounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in adqolcEncounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{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))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(adqolcEncounter.reasonReference)},{participantHistory:(for phy in to_array (adqolcEncounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       }
     };
   },
@@ -19094,7 +19240,7 @@ var dashboardQuery = {
         Encounter: "Encounter._key=='".concat(encounter_key, "' && Encounter.activestatus==true && lower(document(Encounter.status).display)=='consultation over'"),
         Appointment: "Appointment.id in Encounter.appointmentId && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end)
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))})"
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))})"
     };
   }
 };
@@ -20412,7 +20558,7 @@ var REASON_MASTER = createAsyncThunk("dashboardApiSlice/reasonMaster", /*#__PURE
 })));
 
 var generateReadJSON = function generateReadJSON(data) {
-  var _data$Encounter$visit, _data$Encounter, _data$Encounter2, _data$Encounter3, _data$Encounter$reaso, _data$Encounter4, _data$Encounter4$reas, _data$Appointment, _data$Appointment2, _data$Appointment$con, _data$Appointment3, _data$Appointment4, _data$Appointment5, _data$Appointment6, _data$Appointment6$ap, _data$Encounter$patie, _data$Encounter5, _data$Encounter5$pati, _data$Encounter5$pati2, _data$Encounter5$pati3, _ref43, _data$Encounter6, _data$Encounter6$pati, _data$Encounter6$pati2, _data$Encounter6$pati3, _data$Encounter7, _data$Encounter7$pati, _data$Encounter7$pati2, _data$Encounter7$pati3, _data$Encounter$patie2, _data$Encounter8, _data$Encounter8$pati, _data$Encounter8$pati2, _data$Encounter9, _data$Encounter9$pati, _data$Encounter9$pati2, _data$Encounter9$pati3, _data$Encounter10, _data$Encounter10$pat, _data$Encounter10$pat2, _data$Encounter10$pat3, _data$Encounter11, _data$Encounter11$pat, _data$Encounter11$pat2, _data$Encounter11$pat3, _data$Encounter$patie3, _data$Encounter12, _data$Encounter12$pat, _data$Encounter12$pat2, _data$Encounter$patie4, _data$Encounter13, _data$Encounter13$pat, _data$Encounter13$pat2, _data$Encounter13$pat3, _data$Encounter13$pat4, _data$Encounter$pract, _data$Encounter14, _data$Encounter14$pra, _data$Encounter14$pra2, _data$Encounter14$pra3, _data$Encounter14$pra4, _data$Encounter15, _data$Encounter15$pra, _data$Encounter15$pra2, _data$Encounter16, _data$Encounter16$pra, _data$Encounter16$pra2, _data$Encounter$parti, _data$Encounter17, _data$Encounter17$par, _data$Encounter17$par2, _data$Encounter17$par3, _data$Encounter17$par4, _data$Encounter$parti2, _data$Encounter18, _data$Encounter18$par, _data$Encounter18$par2, _data$Encounter18$par3, _data$Encounter18$par4, _data$Encounter18$par5, _data$Encounter18$par6, _data$Encounter18$par7, _data$Encounter18$par8, _data$Encounter18$par9, _data$Encounter$parti3, _data$Encounter19, _data$Encounter19$par, _data$Encounter19$par2, _data$Encounter19$par3, _data$Encounter19$par4, _data$Encounter19$par5, _data$Encounter19$par6, _data$Encounter$parti4, _data$Encounter20, _data$Encounter20$par, _data$Encounter20$par2, _data$Encounter20$par3, _data$Encounter20$par4, _data$Encounter20$par5, _data$Encounter20$par6, _data$Encounter$parti5, _data$Encounter21, _data$Encounter21$par, _data$Encounter21$par2, _data$Encounter21$par3, _data$Encounter$pract2, _data$Encounter22, _data$Encounter22$pra, _data$Encounter22$pra2, _data$Encounter22$pra3, _data$Encounter22$pra4;
+  var _data$Encounter$visit, _data$Encounter, _data$Encounter2, _data$Encounter3, _data$Encounter$reaso, _data$Encounter4, _data$Encounter4$reas, _data$Appointment, _data$Appointment2, _data$Appointment$con, _data$Appointment3, _data$Appointment4, _data$Appointment4$ap, _data$Appointment5, _data$Appointment6, _data$Appointment6$ap, _data$Encounter$patie, _data$Encounter5, _data$Encounter5$pati, _data$Encounter5$pati2, _data$Encounter5$pati3, _ref43, _data$Encounter6, _data$Encounter6$pati, _data$Encounter6$pati2, _data$Encounter6$pati3, _data$Encounter7, _data$Encounter7$pati, _data$Encounter7$pati2, _data$Encounter7$pati3, _data$Encounter$patie2, _data$Encounter8, _data$Encounter8$pati, _data$Encounter8$pati2, _data$Encounter9, _data$Encounter9$pati, _data$Encounter9$pati2, _data$Encounter9$pati3, _data$Encounter9$pati4, _data$Encounter10, _data$Encounter10$pat, _data$Encounter10$pat2, _data$Encounter10$pat3, _data$Encounter10$pat4, _data$Encounter11, _data$Encounter11$pat, _data$Encounter11$pat2, _data$Encounter11$pat3, _data$Encounter11$pat4, _data$Encounter$patie3, _data$Encounter12, _data$Encounter12$pat, _data$Encounter12$pat2, _data$Encounter$patie4, _data$Encounter13, _data$Encounter13$pat, _data$Encounter13$pat2, _data$Encounter13$pat3, _data$Encounter13$pat4, _data$Encounter$pract, _data$Encounter14, _data$Encounter14$pra, _data$Encounter14$pra2, _data$Encounter14$pra3, _data$Encounter14$pra4, _data$Encounter15, _data$Encounter15$pra, _data$Encounter15$pra2, _data$Encounter16, _data$Encounter16$pra, _data$Encounter16$pra2, _data$Encounter$parti, _data$Encounter17, _data$Encounter17$par, _data$Encounter17$par2, _data$Encounter17$par3, _data$Encounter17$par4, _data$Encounter$parti2, _data$Encounter18, _data$Encounter18$par, _data$Encounter18$par2, _data$Encounter18$par3, _data$Encounter18$par4, _data$Encounter18$par5, _data$Encounter18$par6, _data$Encounter18$par7, _data$Encounter18$par8, _data$Encounter18$par9, _data$Encounter$parti3, _data$Encounter19, _data$Encounter19$par, _data$Encounter19$par2, _data$Encounter19$par3, _data$Encounter19$par4, _data$Encounter19$par5, _data$Encounter19$par6, _data$Encounter$parti4, _data$Encounter20, _data$Encounter20$par, _data$Encounter20$par2, _data$Encounter20$par3, _data$Encounter20$par4, _data$Encounter20$par5, _data$Encounter20$par6, _data$Encounter$parti5, _data$Encounter21, _data$Encounter21$par, _data$Encounter21$par2, _data$Encounter21$par3, _data$Encounter$pract2, _data$Encounter22, _data$Encounter22$pra, _data$Encounter22$pra2, _data$Encounter22$pra3, _data$Encounter22$pra4;
 
   var json = {
     visitType: (_data$Encounter$visit = data === null || data === void 0 ? void 0 : (_data$Encounter = data.Encounter) === null || _data$Encounter === void 0 ? void 0 : _data$Encounter.visit_type) !== null && _data$Encounter$visit !== void 0 ? _data$Encounter$visit : "",
@@ -20420,12 +20566,14 @@ var generateReadJSON = function generateReadJSON(data) {
     reasonCode: (_data$Encounter$reaso = data === null || data === void 0 ? void 0 : (_data$Encounter4 = data.Encounter) === null || _data$Encounter4 === void 0 ? void 0 : (_data$Encounter4$reas = _data$Encounter4.reasonReference) === null || _data$Encounter4$reas === void 0 ? void 0 : _data$Encounter4$reas.display) !== null && _data$Encounter$reaso !== void 0 ? _data$Encounter$reaso : "",
     appointmentDateTime: (data === null || data === void 0 ? void 0 : (_data$Appointment = data.Appointment) === null || _data$Appointment === void 0 ? void 0 : _data$Appointment.start) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Appointment2 = data.Appointment) === null || _data$Appointment2 === void 0 ? void 0 : _data$Appointment2.start, "DD MMM,YYYY hh:mm A") : "",
     consultationMode: (_data$Appointment$con = data === null || data === void 0 ? void 0 : (_data$Appointment3 = data.Appointment) === null || _data$Appointment3 === void 0 ? void 0 : _data$Appointment3.consultationMode) !== null && _data$Appointment$con !== void 0 ? _data$Appointment$con : "",
-    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment4 = data.Appointment) === null || _data$Appointment4 === void 0 ? void 0 : _data$Appointment4.appointmentReason) && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment5 = data.Appointment) === null || _data$Appointment5 === void 0 ? void 0 : _data$Appointment5.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment6 = data.Appointment) === null || _data$Appointment6 === void 0 ? void 0 : (_data$Appointment6$ap = _data$Appointment6.appointmentReason) === null || _data$Appointment6$ap === void 0 ? void 0 : _data$Appointment6$ap.join(",") : "",
+    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment4 = data.Appointment) === null || _data$Appointment4 === void 0 ? void 0 : (_data$Appointment4$ap = _data$Appointment4.appointmentReason) === null || _data$Appointment4$ap === void 0 ? void 0 : _data$Appointment4$ap.length) > 0 && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment5 = data.Appointment) === null || _data$Appointment5 === void 0 ? void 0 : _data$Appointment5.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment6 = data.Appointment) === null || _data$Appointment6 === void 0 ? void 0 : (_data$Appointment6$ap = _data$Appointment6.appointmentReason) === null || _data$Appointment6$ap === void 0 ? void 0 : _data$Appointment6$ap.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v.display;
+    }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie = data === null || data === void 0 ? void 0 : (_data$Encounter5 = data.Encounter) === null || _data$Encounter5 === void 0 ? void 0 : (_data$Encounter5$pati = _data$Encounter5.patient_id) === null || _data$Encounter5$pati === void 0 ? void 0 : (_data$Encounter5$pati2 = _data$Encounter5$pati[0]) === null || _data$Encounter5$pati2 === void 0 ? void 0 : (_data$Encounter5$pati3 = _data$Encounter5$pati2.photo) === null || _data$Encounter5$pati3 === void 0 ? void 0 : _data$Encounter5$pati3[0]) !== null && _data$Encounter$patie !== void 0 ? _data$Encounter$patie : "",
     patientName: (_ref43 = (data === null || data === void 0 ? void 0 : (_data$Encounter6 = data.Encounter) === null || _data$Encounter6 === void 0 ? void 0 : (_data$Encounter6$pati = _data$Encounter6.patient_id) === null || _data$Encounter6$pati === void 0 ? void 0 : (_data$Encounter6$pati2 = _data$Encounter6$pati[0].name) === null || _data$Encounter6$pati2 === void 0 ? void 0 : (_data$Encounter6$pati3 = _data$Encounter6$pati2[0]) === null || _data$Encounter6$pati3 === void 0 ? void 0 : _data$Encounter6$pati3.given) + (data === null || data === void 0 ? void 0 : (_data$Encounter7 = data.Encounter) === null || _data$Encounter7 === void 0 ? void 0 : (_data$Encounter7$pati = _data$Encounter7.patient_id) === null || _data$Encounter7$pati === void 0 ? void 0 : (_data$Encounter7$pati2 = _data$Encounter7$pati[0].name) === null || _data$Encounter7$pati2 === void 0 ? void 0 : (_data$Encounter7$pati3 = _data$Encounter7$pati2[0]) === null || _data$Encounter7$pati3 === void 0 ? void 0 : _data$Encounter7$pati3.family)) !== null && _ref43 !== void 0 ? _ref43 : "",
     patientAge: (_data$Encounter$patie2 = data === null || data === void 0 ? void 0 : (_data$Encounter8 = data.Encounter) === null || _data$Encounter8 === void 0 ? void 0 : (_data$Encounter8$pati = _data$Encounter8.patient_id) === null || _data$Encounter8$pati === void 0 ? void 0 : (_data$Encounter8$pati2 = _data$Encounter8$pati[0]) === null || _data$Encounter8$pati2 === void 0 ? void 0 : _data$Encounter8$pati2.age) !== null && _data$Encounter$patie2 !== void 0 ? _data$Encounter$patie2 : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter9 = data.Encounter) === null || _data$Encounter9 === void 0 ? void 0 : (_data$Encounter9$pati = _data$Encounter9.patient_id) === null || _data$Encounter9$pati === void 0 ? void 0 : (_data$Encounter9$pati2 = _data$Encounter9$pati[0]) === null || _data$Encounter9$pati2 === void 0 ? void 0 : (_data$Encounter9$pati3 = _data$Encounter9$pati2.gender) === null || _data$Encounter9$pati3 === void 0 ? void 0 : _data$Encounter9$pati3.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter10 = data.Encounter) === null || _data$Encounter10 === void 0 ? void 0 : (_data$Encounter10$pat = _data$Encounter10.patient_id) === null || _data$Encounter10$pat === void 0 ? void 0 : (_data$Encounter10$pat2 = _data$Encounter10$pat[0]) === null || _data$Encounter10$pat2 === void 0 ? void 0 : (_data$Encounter10$pat3 = _data$Encounter10$pat2.gender) === null || _data$Encounter10$pat3 === void 0 ? void 0 : _data$Encounter10$pat3.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter11 = data.Encounter) === null || _data$Encounter11 === void 0 ? void 0 : (_data$Encounter11$pat = _data$Encounter11.patient_id) === null || _data$Encounter11$pat === void 0 ? void 0 : (_data$Encounter11$pat2 = _data$Encounter11$pat[0]) === null || _data$Encounter11$pat2 === void 0 ? void 0 : (_data$Encounter11$pat3 = _data$Encounter11$pat2.gender) === null || _data$Encounter11$pat3 === void 0 ? void 0 : _data$Encounter11$pat3.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter9 = data.Encounter) === null || _data$Encounter9 === void 0 ? void 0 : (_data$Encounter9$pati = _data$Encounter9.patient_id) === null || _data$Encounter9$pati === void 0 ? void 0 : (_data$Encounter9$pati2 = _data$Encounter9$pati[0]) === null || _data$Encounter9$pati2 === void 0 ? void 0 : (_data$Encounter9$pati3 = _data$Encounter9$pati2.gender) === null || _data$Encounter9$pati3 === void 0 ? void 0 : (_data$Encounter9$pati4 = _data$Encounter9$pati3.display) === null || _data$Encounter9$pati4 === void 0 ? void 0 : _data$Encounter9$pati4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter10 = data.Encounter) === null || _data$Encounter10 === void 0 ? void 0 : (_data$Encounter10$pat = _data$Encounter10.patient_id) === null || _data$Encounter10$pat === void 0 ? void 0 : (_data$Encounter10$pat2 = _data$Encounter10$pat[0]) === null || _data$Encounter10$pat2 === void 0 ? void 0 : (_data$Encounter10$pat3 = _data$Encounter10$pat2.gender) === null || _data$Encounter10$pat3 === void 0 ? void 0 : (_data$Encounter10$pat4 = _data$Encounter10$pat3.display) === null || _data$Encounter10$pat4 === void 0 ? void 0 : _data$Encounter10$pat4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter11 = data.Encounter) === null || _data$Encounter11 === void 0 ? void 0 : (_data$Encounter11$pat = _data$Encounter11.patient_id) === null || _data$Encounter11$pat === void 0 ? void 0 : (_data$Encounter11$pat2 = _data$Encounter11$pat[0]) === null || _data$Encounter11$pat2 === void 0 ? void 0 : (_data$Encounter11$pat3 = _data$Encounter11$pat2.gender) === null || _data$Encounter11$pat3 === void 0 ? void 0 : (_data$Encounter11$pat4 = _data$Encounter11$pat3.display) === null || _data$Encounter11$pat4 === void 0 ? void 0 : _data$Encounter11$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie3 = data === null || data === void 0 ? void 0 : (_data$Encounter12 = data.Encounter) === null || _data$Encounter12 === void 0 ? void 0 : (_data$Encounter12$pat = _data$Encounter12.patient_id) === null || _data$Encounter12$pat === void 0 ? void 0 : (_data$Encounter12$pat2 = _data$Encounter12$pat[0]) === null || _data$Encounter12$pat2 === void 0 ? void 0 : _data$Encounter12$pat2.MRN) !== null && _data$Encounter$patie3 !== void 0 ? _data$Encounter$patie3 : "",
     patientMobileNumber: (_data$Encounter$patie4 = data === null || data === void 0 ? void 0 : (_data$Encounter13 = data.Encounter) === null || _data$Encounter13 === void 0 ? void 0 : (_data$Encounter13$pat = _data$Encounter13.patient_id) === null || _data$Encounter13$pat === void 0 ? void 0 : (_data$Encounter13$pat2 = _data$Encounter13$pat[0]) === null || _data$Encounter13$pat2 === void 0 ? void 0 : (_data$Encounter13$pat3 = _data$Encounter13$pat2.telecom) === null || _data$Encounter13$pat3 === void 0 ? void 0 : (_data$Encounter13$pat4 = _data$Encounter13$pat3[0]) === null || _data$Encounter13$pat4 === void 0 ? void 0 : _data$Encounter13$pat4.value) !== null && _data$Encounter$patie4 !== void 0 ? _data$Encounter$patie4 : "",
     specialityName: (_data$Encounter$pract = data === null || data === void 0 ? void 0 : (_data$Encounter14 = data.Encounter) === null || _data$Encounter14 === void 0 ? void 0 : (_data$Encounter14$pra = _data$Encounter14.practitioner_details) === null || _data$Encounter14$pra === void 0 ? void 0 : (_data$Encounter14$pra2 = _data$Encounter14$pra[0]) === null || _data$Encounter14$pra2 === void 0 ? void 0 : (_data$Encounter14$pra3 = _data$Encounter14$pra2.speciality[0]) === null || _data$Encounter14$pra3 === void 0 ? void 0 : (_data$Encounter14$pra4 = _data$Encounter14$pra3.coding[0]) === null || _data$Encounter14$pra4 === void 0 ? void 0 : _data$Encounter14$pra4.display) !== null && _data$Encounter$pract !== void 0 ? _data$Encounter$pract : "",
@@ -20499,21 +20647,22 @@ 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$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;
+  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$Appointment10$a, _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$Encounter31$pat4, _data$Encounter32, _data$Encounter32$pat, _data$Encounter32$pat2, _data$Encounter32$pat3, _data$Encounter32$pat4, _data$Encounter33, _data$Encounter33$pat, _data$Encounter33$pat2, _data$Encounter33$pat3, _data$Encounter33$pat4, _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") : "",
     reasonCode: (_data$Encounter$reaso2 = data === null || data === void 0 ? void 0 : (_data$Encounter26 = data.Encounter) === null || _data$Encounter26 === void 0 ? void 0 : (_data$Encounter26$rea = _data$Encounter26.reasonReference) === null || _data$Encounter26$rea === void 0 ? void 0 : _data$Encounter26$rea.display) !== null && _data$Encounter$reaso2 !== void 0 ? _data$Encounter$reaso2 : "",
     appointmentDateTime: (data === null || data === void 0 ? void 0 : (_data$Appointment7 = data.Appointment) === null || _data$Appointment7 === void 0 ? void 0 : _data$Appointment7.start) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Appointment8 = data.Appointment) === null || _data$Appointment8 === void 0 ? void 0 : _data$Appointment8.start, "DD MMM,YYYY hh:mm A") : "",
     consultationMode: (_data$Appointment$con2 = data === null || data === void 0 ? void 0 : (_data$Appointment9 = data.Appointment) === null || _data$Appointment9 === void 0 ? void 0 : _data$Appointment9.consultationMode) !== null && _data$Appointment$con2 !== void 0 ? _data$Appointment$con2 : "",
-    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment10 = data.Appointment) === null || _data$Appointment10 === void 0 ? void 0 : _data$Appointment10.appointmentReason) && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment11 = data.Appointment) === null || _data$Appointment11 === void 0 ? void 0 : _data$Appointment11.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment12 = data.Appointment) === null || _data$Appointment12 === void 0 ? void 0 : (_data$Appointment12$a = _data$Appointment12.appointmentReason) === null || _data$Appointment12$a === void 0 ? void 0 : _data$Appointment12$a.join(",") : "",
+    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment10 = data.Appointment) === null || _data$Appointment10 === void 0 ? void 0 : (_data$Appointment10$a = _data$Appointment10.appointmentReason) === null || _data$Appointment10$a === void 0 ? void 0 : _data$Appointment10$a.length) > 0 && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment11 = data.Appointment) === null || _data$Appointment11 === void 0 ? void 0 : _data$Appointment11.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment12 = data.Appointment) === null || _data$Appointment12 === void 0 ? void 0 : (_data$Appointment12$a = _data$Appointment12.appointmentReason) === null || _data$Appointment12$a === void 0 ? void 0 : _data$Appointment12$a.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v.display;
+    }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie5 = data === null || data === void 0 ? void 0 : (_data$Encounter27 = data.Encounter) === null || _data$Encounter27 === void 0 ? void 0 : (_data$Encounter27$pat = _data$Encounter27.patient_id) === null || _data$Encounter27$pat === void 0 ? void 0 : (_data$Encounter27$pat2 = _data$Encounter27$pat[0]) === null || _data$Encounter27$pat2 === void 0 ? void 0 : (_data$Encounter27$pat3 = _data$Encounter27$pat2.photo) === null || _data$Encounter27$pat3 === void 0 ? void 0 : _data$Encounter27$pat3[0]) !== null && _data$Encounter$patie5 !== void 0 ? _data$Encounter$patie5 : "",
     patientName: (_ref46 = (data === null || data === void 0 ? void 0 : (_data$Encounter28 = data.Encounter) === null || _data$Encounter28 === void 0 ? void 0 : (_data$Encounter28$pat = _data$Encounter28.patient_id) === null || _data$Encounter28$pat === void 0 ? void 0 : (_data$Encounter28$pat2 = _data$Encounter28$pat[0].name) === null || _data$Encounter28$pat2 === void 0 ? void 0 : (_data$Encounter28$pat3 = _data$Encounter28$pat2[0]) === null || _data$Encounter28$pat3 === void 0 ? void 0 : _data$Encounter28$pat3.given) + (data === null || data === void 0 ? void 0 : (_data$Encounter29 = data.Encounter) === null || _data$Encounter29 === void 0 ? void 0 : (_data$Encounter29$pat = _data$Encounter29.patient_id) === null || _data$Encounter29$pat === void 0 ? void 0 : (_data$Encounter29$pat2 = _data$Encounter29$pat[0].name) === null || _data$Encounter29$pat2 === void 0 ? void 0 : (_data$Encounter29$pat3 = _data$Encounter29$pat2[0]) === null || _data$Encounter29$pat3 === void 0 ? void 0 : _data$Encounter29$pat3.family)) !== null && _ref46 !== void 0 ? _ref46 : "",
     patientAge: (_data$Encounter$patie6 = data === null || data === void 0 ? void 0 : (_data$Encounter30 = data.Encounter) === null || _data$Encounter30 === void 0 ? void 0 : (_data$Encounter30$pat = _data$Encounter30.patient_id) === null || _data$Encounter30$pat === void 0 ? void 0 : (_data$Encounter30$pat2 = _data$Encounter30$pat[0]) === null || _data$Encounter30$pat2 === void 0 ? void 0 : _data$Encounter30$pat2.age) !== null && _data$Encounter$patie6 !== void 0 ? _data$Encounter$patie6 : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter31 = data.Encounter) === null || _data$Encounter31 === void 0 ? void 0 : (_data$Encounter31$pat = _data$Encounter31.patient_id) === null || _data$Encounter31$pat === void 0 ? void 0 : (_data$Encounter31$pat2 = _data$Encounter31$pat[0]) === null || _data$Encounter31$pat2 === void 0 ? void 0 : (_data$Encounter31$pat3 = _data$Encounter31$pat2.gender) === null || _data$Encounter31$pat3 === void 0 ? void 0 : _data$Encounter31$pat3.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter32 = data.Encounter) === null || _data$Encounter32 === void 0 ? void 0 : (_data$Encounter32$pat = _data$Encounter32.patient_id) === null || _data$Encounter32$pat === void 0 ? void 0 : (_data$Encounter32$pat2 = _data$Encounter32$pat[0]) === null || _data$Encounter32$pat2 === void 0 ? void 0 : (_data$Encounter32$pat3 = _data$Encounter32$pat2.gender) === null || _data$Encounter32$pat3 === void 0 ? void 0 : _data$Encounter32$pat3.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter33 = data.Encounter) === null || _data$Encounter33 === void 0 ? void 0 : (_data$Encounter33$pat = _data$Encounter33.patient_id) === null || _data$Encounter33$pat === void 0 ? void 0 : (_data$Encounter33$pat2 = _data$Encounter33$pat[0]) === null || _data$Encounter33$pat2 === void 0 ? void 0 : (_data$Encounter33$pat3 = _data$Encounter33$pat2.gender) === null || _data$Encounter33$pat3 === void 0 ? void 0 : _data$Encounter33$pat3.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter31 = data.Encounter) === null || _data$Encounter31 === void 0 ? void 0 : (_data$Encounter31$pat = _data$Encounter31.patient_id) === null || _data$Encounter31$pat === void 0 ? void 0 : (_data$Encounter31$pat2 = _data$Encounter31$pat[0]) === null || _data$Encounter31$pat2 === void 0 ? void 0 : (_data$Encounter31$pat3 = _data$Encounter31$pat2.gender) === null || _data$Encounter31$pat3 === void 0 ? void 0 : (_data$Encounter31$pat4 = _data$Encounter31$pat3.display) === null || _data$Encounter31$pat4 === void 0 ? void 0 : _data$Encounter31$pat4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter32 = data.Encounter) === null || _data$Encounter32 === void 0 ? void 0 : (_data$Encounter32$pat = _data$Encounter32.patient_id) === null || _data$Encounter32$pat === void 0 ? void 0 : (_data$Encounter32$pat2 = _data$Encounter32$pat[0]) === null || _data$Encounter32$pat2 === void 0 ? void 0 : (_data$Encounter32$pat3 = _data$Encounter32$pat2.gender) === null || _data$Encounter32$pat3 === void 0 ? void 0 : (_data$Encounter32$pat4 = _data$Encounter32$pat3.display) === null || _data$Encounter32$pat4 === void 0 ? void 0 : _data$Encounter32$pat4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter33 = data.Encounter) === null || _data$Encounter33 === void 0 ? void 0 : (_data$Encounter33$pat = _data$Encounter33.patient_id) === null || _data$Encounter33$pat === void 0 ? void 0 : (_data$Encounter33$pat2 = _data$Encounter33$pat[0]) === null || _data$Encounter33$pat2 === void 0 ? void 0 : (_data$Encounter33$pat3 = _data$Encounter33$pat2.gender) === null || _data$Encounter33$pat3 === void 0 ? void 0 : (_data$Encounter33$pat4 = _data$Encounter33$pat3.display) === null || _data$Encounter33$pat4 === void 0 ? void 0 : _data$Encounter33$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie7 = data === null || data === void 0 ? void 0 : (_data$Encounter34 = data.Encounter) === null || _data$Encounter34 === void 0 ? void 0 : (_data$Encounter34$pat = _data$Encounter34.patient_id) === null || _data$Encounter34$pat === void 0 ? void 0 : (_data$Encounter34$pat2 = _data$Encounter34$pat[0]) === null || _data$Encounter34$pat2 === void 0 ? void 0 : _data$Encounter34$pat2.MRN) !== null && _data$Encounter$patie7 !== void 0 ? _data$Encounter$patie7 : "",
     patientMobileNumber: (_data$Encounter$patie8 = data === null || data === void 0 ? void 0 : (_data$Encounter35 = data.Encounter) === null || _data$Encounter35 === void 0 ? void 0 : (_data$Encounter35$pat = _data$Encounter35.patient_id) === null || _data$Encounter35$pat === void 0 ? void 0 : (_data$Encounter35$pat2 = _data$Encounter35$pat[0]) === null || _data$Encounter35$pat2 === void 0 ? void 0 : (_data$Encounter35$pat3 = _data$Encounter35$pat2.telecom) === null || _data$Encounter35$pat3 === void 0 ? void 0 : (_data$Encounter35$pat4 = _data$Encounter35$pat3[0]) === null || _data$Encounter35$pat4 === void 0 ? void 0 : _data$Encounter35$pat4.value) !== null && _data$Encounter$patie8 !== void 0 ? _data$Encounter$patie8 : "",
     specialityName: (_data$Encounter$pract3 = data === null || data === void 0 ? void 0 : (_data$Encounter36 = data.Encounter) === null || _data$Encounter36 === void 0 ? void 0 : (_data$Encounter36$pra = _data$Encounter36.practitioner_details) === null || _data$Encounter36$pra === void 0 ? void 0 : (_data$Encounter36$pra2 = _data$Encounter36$pra[0]) === null || _data$Encounter36$pra2 === void 0 ? void 0 : (_data$Encounter36$pra3 = _data$Encounter36$pra2.speciality) === null || _data$Encounter36$pra3 === void 0 ? void 0 : (_data$Encounter36$pra4 = _data$Encounter36$pra3[0]) === null || _data$Encounter36$pra4 === void 0 ? void 0 : (_data$Encounter36$pra5 = _data$Encounter36$pra4.coding) === null || _data$Encounter36$pra5 === void 0 ? void 0 : (_data$Encounter36$pra6 = _data$Encounter36$pra5[0]) === null || _data$Encounter36$pra6 === void 0 ? void 0 : _data$Encounter36$pra6.display) !== null && _data$Encounter$pract3 !== void 0 ? _data$Encounter$pract3 : "",
@@ -20533,7 +20682,7 @@ var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
 };
 
 var generateReadJSON_colseConsultation = function generateReadJSON_colseConsultation(data) {
-  var _data$visit_type, _data$reasonReference, _data$reasonReference2, _data$appointmentId, _data$appointmentId2, _data$appointmentId$c, _data$appointmentId3, _data$appointmentId4, _data$appointmentId4$, _data$appointmentId5, _data$appointmentId6, _data$appointmentId6$, _data$patient_id$0$ph, _data$patient_id, _data$patient_id$, _data$patient_id$$pho, _ref47, _data$patient_id2, _data$patient_id2$0$n, _data$patient_id2$0$n2, _data$patient_id3, _data$patient_id3$0$n, _data$patient_id3$0$n2, _data$patient_id$0$ag, _data$patient_id4, _data$patient_id4$, _data$patient_id5, _data$patient_id5$, _data$patient_id5$$ge, _data$patient_id6, _data$patient_id6$, _data$patient_id6$$ge, _data$patient_id7, _data$patient_id7$, _data$patient_id7$$ge, _data$patient_id$0$al, _data$patient_id8, _data$patient_id8$, _data$patient_id$0$te, _data$patient_id9, _data$patient_id9$, _data$patient_id9$$te, _data$patient_id9$$te2, _data$practitioner_de, _data$practitioner_de2, _data$practitioner_de3, _data$practitioner_de4, _data$practitioner_de5, _data$practitioner_de6, _data$practitioner_de7, _data$practitioner_de8, _data$practitioner_de9, _data$practitioner_de10, _data$practitioner_de11;
+  var _data$visit_type, _data$reasonReference, _data$reasonReference2, _data$appointmentId, _data$appointmentId2, _data$appointmentId$c, _data$appointmentId3, _data$appointmentId4, _data$appointmentId4$, _data$appointmentId5, _data$appointmentId6, _data$appointmentId6$, _data$patient_id$0$ph, _data$patient_id, _data$patient_id$, _data$patient_id$$pho, _ref47, _data$patient_id2, _data$patient_id2$0$n, _data$patient_id2$0$n2, _data$patient_id3, _data$patient_id3$0$n, _data$patient_id3$0$n2, _data$patient_id$0$ag, _data$patient_id4, _data$patient_id4$, _data$patient_id5, _data$patient_id5$, _data$patient_id5$$ge, _data$patient_id5$$ge2, _data$patient_id6, _data$patient_id6$, _data$patient_id6$$ge, _data$patient_id6$$ge2, _data$patient_id7, _data$patient_id7$, _data$patient_id7$$ge, _data$patient_id7$$ge2, _data$patient_id$0$al, _data$patient_id8, _data$patient_id8$, _data$patient_id$0$te, _data$patient_id9, _data$patient_id9$, _data$patient_id9$$te, _data$patient_id9$$te2, _data$practitioner_de, _data$practitioner_de2, _data$practitioner_de3, _data$practitioner_de4, _data$practitioner_de5, _data$practitioner_de6, _data$practitioner_de7, _data$practitioner_de8, _data$practitioner_de9, _data$practitioner_de10, _data$practitioner_de11, _data$practitioner_de12, _data$practitioner_de13, _data$practitioner_de14;
 
   var json = {
     visitType: (_data$visit_type = data === null || data === void 0 ? void 0 : data.visit_type) !== null && _data$visit_type !== void 0 ? _data$visit_type : "",
@@ -20549,7 +20698,7 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     // need to expand
     patientName: (_ref47 = (data === null || data === void 0 ? void 0 : (_data$patient_id2 = data.patient_id) === null || _data$patient_id2 === void 0 ? void 0 : (_data$patient_id2$0$n = _data$patient_id2[0].name) === null || _data$patient_id2$0$n === void 0 ? void 0 : (_data$patient_id2$0$n2 = _data$patient_id2$0$n[0]) === null || _data$patient_id2$0$n2 === void 0 ? void 0 : _data$patient_id2$0$n2.given) + (data === null || data === void 0 ? void 0 : (_data$patient_id3 = data.patient_id) === null || _data$patient_id3 === void 0 ? void 0 : (_data$patient_id3$0$n = _data$patient_id3[0].name) === null || _data$patient_id3$0$n === void 0 ? void 0 : (_data$patient_id3$0$n2 = _data$patient_id3$0$n[0]) === null || _data$patient_id3$0$n2 === void 0 ? void 0 : _data$patient_id3$0$n2.family)) !== null && _ref47 !== void 0 ? _ref47 : "",
     patientAge: (_data$patient_id$0$ag = data === null || data === void 0 ? void 0 : (_data$patient_id4 = data.patient_id) === null || _data$patient_id4 === void 0 ? void 0 : (_data$patient_id4$ = _data$patient_id4[0]) === null || _data$patient_id4$ === void 0 ? void 0 : _data$patient_id4$.age) !== null && _data$patient_id$0$ag !== void 0 ? _data$patient_id$0$ag : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$patient_id5 = data.patient_id) === null || _data$patient_id5 === void 0 ? void 0 : (_data$patient_id5$ = _data$patient_id5[0]) === null || _data$patient_id5$ === void 0 ? void 0 : (_data$patient_id5$$ge = _data$patient_id5$.gender) === null || _data$patient_id5$$ge === void 0 ? void 0 : _data$patient_id5$$ge.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$patient_id6 = data.patient_id) === null || _data$patient_id6 === void 0 ? void 0 : (_data$patient_id6$ = _data$patient_id6[0]) === null || _data$patient_id6$ === void 0 ? void 0 : (_data$patient_id6$$ge = _data$patient_id6$.gender) === null || _data$patient_id6$$ge === void 0 ? void 0 : _data$patient_id6$$ge.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$patient_id7 = data.patient_id) === null || _data$patient_id7 === void 0 ? void 0 : (_data$patient_id7$ = _data$patient_id7[0]) === null || _data$patient_id7$ === void 0 ? void 0 : (_data$patient_id7$$ge = _data$patient_id7$.gender) === null || _data$patient_id7$$ge === void 0 ? void 0 : _data$patient_id7$$ge.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$patient_id5 = data.patient_id) === null || _data$patient_id5 === void 0 ? void 0 : (_data$patient_id5$ = _data$patient_id5[0]) === null || _data$patient_id5$ === void 0 ? void 0 : (_data$patient_id5$$ge = _data$patient_id5$.gender) === null || _data$patient_id5$$ge === void 0 ? void 0 : (_data$patient_id5$$ge2 = _data$patient_id5$$ge.display) === null || _data$patient_id5$$ge2 === void 0 ? void 0 : _data$patient_id5$$ge2.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$patient_id6 = data.patient_id) === null || _data$patient_id6 === void 0 ? void 0 : (_data$patient_id6$ = _data$patient_id6[0]) === null || _data$patient_id6$ === void 0 ? void 0 : (_data$patient_id6$$ge = _data$patient_id6$.gender) === null || _data$patient_id6$$ge === void 0 ? void 0 : (_data$patient_id6$$ge2 = _data$patient_id6$$ge.display) === null || _data$patient_id6$$ge2 === void 0 ? void 0 : _data$patient_id6$$ge2.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$patient_id7 = data.patient_id) === null || _data$patient_id7 === void 0 ? void 0 : (_data$patient_id7$ = _data$patient_id7[0]) === null || _data$patient_id7$ === void 0 ? void 0 : (_data$patient_id7$$ge = _data$patient_id7$.gender) === null || _data$patient_id7$$ge === void 0 ? void 0 : (_data$patient_id7$$ge2 = _data$patient_id7$$ge.display) === null || _data$patient_id7$$ge2 === void 0 ? void 0 : _data$patient_id7$$ge2.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$patient_id$0$al = data === null || data === void 0 ? void 0 : (_data$patient_id8 = data.patient_id) === null || _data$patient_id8 === void 0 ? void 0 : (_data$patient_id8$ = _data$patient_id8[0]) === null || _data$patient_id8$ === void 0 ? void 0 : _data$patient_id8$.alias) !== null && _data$patient_id$0$al !== void 0 ? _data$patient_id$0$al : "",
     patientMobileNumber: (_data$patient_id$0$te = data === null || data === void 0 ? void 0 : (_data$patient_id9 = data.patient_id) === null || _data$patient_id9 === void 0 ? void 0 : (_data$patient_id9$ = _data$patient_id9[0]) === null || _data$patient_id9$ === void 0 ? void 0 : (_data$patient_id9$$te = _data$patient_id9$.telecom) === null || _data$patient_id9$$te === void 0 ? void 0 : (_data$patient_id9$$te2 = _data$patient_id9$$te[0]) === null || _data$patient_id9$$te2 === void 0 ? void 0 : _data$patient_id9$$te2.value) !== null && _data$patient_id$0$te !== void 0 ? _data$patient_id$0$te : "",
     specialityName: (_data$practitioner_de = data === null || data === void 0 ? void 0 : (_data$practitioner_de2 = data.practitioner_details) === null || _data$practitioner_de2 === void 0 ? void 0 : (_data$practitioner_de3 = _data$practitioner_de2[0]) === null || _data$practitioner_de3 === void 0 ? void 0 : (_data$practitioner_de4 = _data$practitioner_de3.speciality) === null || _data$practitioner_de4 === void 0 ? void 0 : (_data$practitioner_de5 = _data$practitioner_de4[0]) === null || _data$practitioner_de5 === void 0 ? void 0 : (_data$practitioner_de6 = _data$practitioner_de5.coding) === null || _data$practitioner_de6 === void 0 ? void 0 : (_data$practitioner_de7 = _data$practitioner_de6[0]) === null || _data$practitioner_de7 === void 0 ? void 0 : _data$practitioner_de7.display) !== null && _data$practitioner_de !== void 0 ? _data$practitioner_de : "",
@@ -20561,9 +20710,7 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     // practitionerRole:
     //   data?.Encounter?.participant?.[0]?.Practitioner_id?.[0]
     //     ?.practitioner_role?.[0]?.role?.[0].coding?.[0]?.display ?? "",
-    // practitioner:
-    //   data?.Encounter?.participant?.[0]?.Practitioner_id?.[0]?.name?.[0]
-    //     ?.text ?? "",
+    practitioner: (_data$practitioner_de12 = data === null || data === void 0 ? void 0 : (_data$practitioner_de13 = data.practitioner_details) === null || _data$practitioner_de13 === void 0 ? void 0 : (_data$practitioner_de14 = _data$practitioner_de13[0]) === null || _data$practitioner_de14 === void 0 ? void 0 : _data$practitioner_de14.id_name) !== null && _data$practitioner_de12 !== void 0 ? _data$practitioner_de12 : "",
     //FOR ASSIGN QUERY
     // practroleId:
     //   data?.participant?.[0]?.Practitioner_id?.[0]
@@ -22569,8 +22716,9 @@ var queries$8 = {
     return {
       db_name: dbName,
       entity: "Diagnosis",
-      filter: "Diagnosis.icdname LIKE '%".concat(input_text, "%'"),
-      return_fields: "{_id:Diagnosis._id,icdcode:Diagnosis.icdcode,icdname:Diagnosis.icdname}"
+      filter: "Diagnosis.icdname LIKE '%".concat(input_text, "%' && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)"),
+      return_fields: "{_id:Diagnosis._id,icdcode:Diagnosis.icdcode,icdname:Diagnosis.icdname}",
+      sort: "Diagnosis.icdname"
     };
   },
   Diagnosis_value: function Diagnosis_value(id) {
@@ -38271,7 +38419,7 @@ 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, _$Appointment2, _$Appointment2$Person, _$Appointment2$Person2, _$Appointment2$Person3, _$Appointment3, _$Appointment3$Person, _$Appointment3$Person2, _$Appointment4, _$Appointment5, _$Appointment6, _$Appointment7, _$Appointment$PersonI4, _$Appointment8, _$Appointment8$Person, _$Appointment8$Person2, _$Appointment8$Person3, _$Appointment8$Person4, _$Appointment$appoint, _$Appointment9, _$Appointment10, _$Appointment11;
+            var _$Appointment, _$Appointment$PersonI, _$Appointment$PersonI2, _$Appointment$PersonI3, _$Appointment2, _$Appointment2$Person, _$Appointment2$Person2, _$Appointment2$Person3, _$Appointment3, _$Appointment3$Person, _$Appointment3$Person2, _$Appointment4, _$Appointment5, _$Appointment6, _$Appointment7, _$Appointment8, _$Appointment8$Person, _$Appointment8$Person2, _$Appointment8$Person3, _$Appointment8$Person4, _$Appointment9, _$Appointment9$Person, _$Appointment9$Person2, _$Appointment9$Person3, _$Appointment9$Person4, _$Appointment$appoint, _$Appointment10, _$Appointment11, _$Appointment12;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38294,25 +38442,21 @@ var GET_APPOINTMENTS = createAsyncThunk("appointmentStatsApiSlice/getAppointment
               // clinic: _?.Encounter?.practitioner_details?.[0]?.clinic,
               // dob: _?.Appointment?.PersonID?.[0]?.birthDay,
               // gender: _?.Appointment?.PersonID?.[0]?.gender,
-              contact: (_$Appointment$PersonI4 = _ === 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$Person3 = _$Appointment8$Person2.telecom) === null || _$Appointment8$Person3 === void 0 ? void 0 : (_$Appointment8$Person4 = _$Appointment8$Person3[0]) === null || _$Appointment8$Person4 === void 0 ? void 0 : _$Appointment8$Person4.value) !== null && _$Appointment$PersonI4 !== void 0 ? _$Appointment$PersonI4 : "",
-              visitType: (_$Appointment$appoint = _ === null || _ === void 0 ? void 0 : (_$Appointment9 = _.Appointment) === null || _$Appointment9 === void 0 ? void 0 : _$Appointment9.appointmentType) !== null && _$Appointment$appoint !== void 0 ? _$Appointment$appoint : "",
-              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment10 = _.Appointment) === null || _$Appointment10 === void 0 ? void 0 : _$Appointment10.appstatus) || "",
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment11 = _.Appointment) === null || _$Appointment11 === void 0 ? void 0 : _$Appointment11.appno) || "",
+              contact: (_ === 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$Person3 = _$Appointment8$Person2.telecom) === null || _$Appointment8$Person3 === void 0 ? void 0 : (_$Appointment8$Person4 = _$Appointment8$Person3[0]) === null || _$Appointment8$Person4 === void 0 ? void 0 : _$Appointment8$Person4.value) ? JSON.stringify(_ === 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.telecom) === null || _$Appointment9$Person3 === void 0 ? void 0 : (_$Appointment9$Person4 = _$Appointment9$Person3[0]) === null || _$Appointment9$Person4 === void 0 ? void 0 : _$Appointment9$Person4.value) : "",
+              visitType: (_$Appointment$appoint = _ === null || _ === void 0 ? void 0 : (_$Appointment10 = _.Appointment) === null || _$Appointment10 === void 0 ? void 0 : _$Appointment10.appointmentType) !== null && _$Appointment$appoint !== void 0 ? _$Appointment$appoint : "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment11 = _.Appointment) === null || _$Appointment11 === void 0 ? void 0 : _$Appointment11.appstatus) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment12 = _.Appointment) === null || _$Appointment12 === void 0 ? void 0 : _$Appointment12.appno) || "",
               // type: "OP",
               // "Register Visit": true,
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
               // data: _,
-              viewaction: JSON.stringify({
-                appNo: _.Appointment.id
-              }),
-              modifyaction: JSON.stringify({
+              action: JSON.stringify({
                 appNo: _.Appointment.id
-              }),
-              cancelaction: JSON.stringify({
-                appNo: _.Appointment.id
-              })
+              }) // modifyaction: JSON.stringify({ appNo: _.Appointment.id }),
+              // cancelaction: JSON.stringify({ appNo: _.Appointment.id }),
+
             };
           }) : [];
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38357,10 +38501,12 @@ 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 _$Appointment12, _$Appointment12$Perso, _$Appointment12$Perso2, _$Appointment12$Perso3, _$Appointment12$Perso4, _$Appointment13, _$Appointment13$Perso, _$Appointment13$Perso2, _$Appointment13$Perso3, _$Appointment13$Perso4, _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Appointment14, _$Appointment14$Perso, _$Appointment14$Perso2, _$Appointment15, _$Appointment16, _$Appointment17, _$Appointment18, _$Encounter3, _$Encounter4, _$Encounter4$status, _$Encounter$appointme, _$Encounter5, _$Encounter5$appointm, _$Encounter$appointme2, _$Encounter6, _$Encounter6$appointm, _$Encounter7, _$Encounter7$patient_, _$Encounter7$patient_2, _$Encounter7$patient_3, _$Encounter7$patient_4, _$Appointment$PersonI5, _$Appointment19, _$Appointment19$Perso, _$Appointment19$Perso2, _$Encounter$patient_i4, _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Encounter$appointme3, _$Encounter9, _$Encounter9$appointm, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter10$patient3, _$Encounter10$patient4, _$Appointment$PersonI6, _$Appointment20, _$Appointment20$Perso, _$Appointment20$Perso2, _$Encounter$patient_i5, _$Encounter11, _$Encounter11$patient, _$Encounter11$patient2, _$Encounter$appointme4, _$Encounter12, _$Encounter12$appoint, _$Encounter13, _$Encounter13$patient, _$Encounter13$patient2, _$Encounter13$patient3, _$Encounter13$patient4, _$Appointment$PersonI7, _$Appointment21, _$Appointment21$Perso, _$Appointment21$Perso2, _$Encounter$patient_i6, _$Encounter14, _$Encounter14$patient, _$Encounter14$patient2;
+            var _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Appointment13, _$Appointment13$Perso, _$Appointment13$Perso2, _$Appointment14, _$Appointment15, _$Appointment16, _$Appointment17, _$Encounter3, _$Encounter$status$di, _$Encounter4, _$Encounter4$status, _$Encounter$appointme, _$Encounter5, _$Encounter5$appointm, _$Encounter$appointme2, _$Encounter6, _$Encounter6$appointm, _$Encounter7, _$Encounter7$patient_, _$Encounter7$patient_2, _$Encounter7$patient_3, _$Encounter7$patient_4, _$Appointment$PersonI4, _$Appointment18, _$Appointment18$Perso, _$Appointment18$Perso2, _$Encounter$patient_i4, _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2;
 
             return {
-              img: (_ === 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) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : (_$Appointment13$Perso = _$Appointment13.PersonID) === null || _$Appointment13$Perso === void 0 ? void 0 : (_$Appointment13$Perso2 = _$Appointment13$Perso[0]) === null || _$Appointment13$Perso2 === void 0 ? void 0 : (_$Appointment13$Perso3 = _$Appointment13$Perso2.photo) === null || _$Appointment13$Perso3 === void 0 ? void 0 : (_$Appointment13$Perso4 = _$Appointment13$Perso3[0]) === null || _$Appointment13$Perso4 === void 0 ? void 0 : _$Appointment13$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.Encounter?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.Encounter?.patient_id?.[0]?.MRN,
               // date: _?.Appointment?.start
@@ -38389,32 +38535,32 @@ var GET_FIRST_VISITS = createAsyncThunk("appointmentStatsApiSlice/getFirstVisits
               // "View Profile": true,
               name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN,
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : (_$Appointment14$Perso = _$Appointment14.PersonID) === null || _$Appointment14$Perso === void 0 ? void 0 : (_$Appointment14$Perso2 = _$Appointment14$Perso[0]) === null || _$Appointment14$Perso2 === void 0 ? void 0 : _$Appointment14$Perso2.birthDay),
-              date: "".concat((_ === 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, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : _$Appointment17.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment18 = _.Appointment) === null || _$Appointment18 === void 0 ? void 0 : _$Appointment18.start, "hh:mm A") : ""),
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : (_$Appointment13$Perso = _$Appointment13.PersonID) === null || _$Appointment13$Perso === void 0 ? void 0 : (_$Appointment13$Perso2 = _$Appointment13$Perso[0]) === null || _$Appointment13$Perso2 === void 0 ? void 0 : _$Appointment13$Perso2.birthDay),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : _$Appointment14.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment15 = _.Appointment) === null || _$Appointment15 === void 0 ? void 0 : _$Appointment15.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment16 = _.Appointment) === null || _$Appointment16 === void 0 ? void 0 : _$Appointment16.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : _$Appointment17.start, "hh:mm A") : ""),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter3 = _.Encounter) === null || _$Encounter3 === void 0 ? void 0 : _$Encounter3.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$status = _$Encounter4.status) === null || _$Encounter4$status === void 0 ? void 0 : _$Encounter4$status.display,
+              appointmentStatus: (_$Encounter$status$di = _ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$status = _$Encounter4.status) === null || _$Encounter4$status === void 0 ? void 0 : _$Encounter4$status.display) !== null && _$Encounter$status$di !== void 0 ? _$Encounter$status$di : "",
               refNo: (_$Encounter$appointme = _ === null || _ === void 0 ? void 0 : (_$Encounter5 = _.Encounter) === null || _$Encounter5 === void 0 ? void 0 : (_$Encounter5$appointm = _$Encounter5.appointmentId) === null || _$Encounter5$appointm === void 0 ? void 0 : _$Encounter5$appointm[0]) !== null && _$Encounter$appointme !== void 0 ? _$Encounter$appointme : "",
-              viewaction: JSON.stringify({
+              action: JSON.stringify({
                 appNo: (_$Encounter$appointme2 = _ === null || _ === void 0 ? void 0 : (_$Encounter6 = _.Encounter) === null || _$Encounter6 === void 0 ? void 0 : (_$Encounter6$appointm = _$Encounter6.appointmentId) === null || _$Encounter6$appointm === void 0 ? void 0 : _$Encounter6$appointm[0]) !== null && _$Encounter$appointme2 !== void 0 ? _$Encounter$appointme2 : "",
                 enId: _.Encounter.id,
                 contact: _ === 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.telecom) === null || _$Encounter7$patient_3 === void 0 ? void 0 : (_$Encounter7$patient_4 = _$Encounter7$patient_3[0]) === null || _$Encounter7$patient_4 === void 0 ? void 0 : _$Encounter7$patient_4.value,
-                personId: (_$Appointment$PersonI5 = _ === 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.Id) !== null && _$Appointment$PersonI5 !== void 0 ? _$Appointment$PersonI5 : null,
+                personId: (_$Appointment$PersonI4 = _ === 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.Id) !== null && _$Appointment$PersonI4 !== void 0 ? _$Appointment$PersonI4 : null,
                 patientId: (_$Encounter$patient_i4 = _ === 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.id) !== null && _$Encounter$patient_i4 !== void 0 ? _$Encounter$patient_i4 : null
-              }),
-              modifyaction: JSON.stringify({
-                appNo: (_$Encounter$appointme3 = _ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$appointm = _$Encounter9.appointmentId) === null || _$Encounter9$appointm === void 0 ? void 0 : _$Encounter9$appointm[0]) !== null && _$Encounter$appointme3 !== void 0 ? _$Encounter$appointme3 : "",
-                enId: _.Encounter.id,
-                contact: _ === 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,
-                personId: (_$Appointment$PersonI6 = _ === 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.Id) !== null && _$Appointment$PersonI6 !== void 0 ? _$Appointment$PersonI6 : null,
-                patientId: (_$Encounter$patient_i5 = _ === 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.id) !== null && _$Encounter$patient_i5 !== void 0 ? _$Encounter$patient_i5 : null
-              }),
-              cancelaction: JSON.stringify({
-                appNo: (_$Encounter$appointme4 = _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$appoint = _$Encounter12.appointmentId) === null || _$Encounter12$appoint === void 0 ? void 0 : _$Encounter12$appoint[0]) !== null && _$Encounter$appointme4 !== void 0 ? _$Encounter$appointme4 : "",
-                enId: _.Encounter.id,
-                contact: _ === 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.telecom) === null || _$Encounter13$patient3 === void 0 ? void 0 : (_$Encounter13$patient4 = _$Encounter13$patient3[0]) === null || _$Encounter13$patient4 === void 0 ? void 0 : _$Encounter13$patient4.value,
-                personId: (_$Appointment$PersonI7 = _ === 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$Perso2.Id) !== null && _$Appointment$PersonI7 !== void 0 ? _$Appointment$PersonI7 : null,
-                patientId: (_$Encounter$patient_i6 = _ === 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.id) !== null && _$Encounter$patient_i6 !== void 0 ? _$Encounter$patient_i6 : null
-              })
+              }) // modifyaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+              // cancelaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+
             };
           }) : [];
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38459,7 +38605,7 @@ 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 _$Encounter15, _$Encounter15$patient, _$Encounter15$patient2, _$Encounter15$patient3, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2, _$Appointment22, _$Appointment22$Perso, _$Appointment22$Perso2, _$Appointment23, _$Appointment24, _$Appointment25, _$Appointment26, _$Encounter17, _$Encounter18, _$Encounter18$status, _$Encounter$appointme5, _$Encounter19, _$Encounter19$appoint, _$Encounter$appointme6, _$Encounter20, _$Encounter20$appoint, _$Encounter21, _$Encounter21$patient, _$Encounter21$patient2, _$Encounter21$patient3, _$Encounter21$patient4, _$Appointment$PersonI8, _$Appointment27, _$Appointment27$Perso, _$Appointment27$Perso2, _$Encounter$patient_i7, _$Encounter22, _$Encounter22$patient, _$Encounter22$patient2, _$Encounter$appointme7, _$Encounter23, _$Encounter23$appoint, _$Encounter24, _$Encounter24$patient, _$Encounter24$patient2, _$Encounter24$patient3, _$Encounter24$patient4, _$Appointment$PersonI9, _$Appointment28, _$Appointment28$Perso, _$Appointment28$Perso2, _$Encounter$patient_i8, _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter$appointme8, _$Encounter26, _$Encounter26$appoint, _$Encounter27, _$Encounter27$patient, _$Encounter27$patient2, _$Encounter27$patient3, _$Encounter27$patient4, _$Appointment$PersonI10, _$Appointment29, _$Appointment29$Perso, _$Appointment29$Perso2, _$Encounter$patient_i9, _$Encounter28, _$Encounter28$patient, _$Encounter28$patient2;
+            var _$Encounter9, _$Encounter9$patient_, _$Encounter9$patient_2, _$Encounter9$patient_3, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Appointment19, _$Appointment19$Perso, _$Appointment19$Perso2, _$Appointment20, _$Appointment21, _$Appointment22, _$Appointment23, _$Encounter11, _$Encounter$status$di2, _$Encounter12, _$Encounter12$status, _$Encounter$appointme3, _$Encounter13, _$Encounter13$appoint, _$Encounter$appointme4, _$Encounter14, _$Encounter14$appoint, _$Encounter15, _$Encounter15$patient, _$Encounter15$patient2, _$Encounter15$patient3, _$Encounter15$patient4, _$Appointment$PersonI5, _$Appointment24, _$Appointment24$Perso, _$Appointment24$Perso2, _$Encounter$patient_i5, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38491,34 +38637,34 @@ var GET_OTHER_VISITS = createAsyncThunk("appointmentStatsApiSlice/getOtherVisits
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$patient = _$Encounter15.patient_id) === null || _$Encounter15$patient === void 0 ? void 0 : (_$Encounter15$patient2 = _$Encounter15$patient[0]) === null || _$Encounter15$patient2 === void 0 ? void 0 : (_$Encounter15$patient3 = _$Encounter15$patient2.name) === null || _$Encounter15$patient3 === void 0 ? void 0 : _$Encounter15$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter16 = _.Encounter) === null || _$Encounter16 === void 0 ? void 0 : (_$Encounter16$patient = _$Encounter16.patient_id) === null || _$Encounter16$patient === void 0 ? void 0 : (_$Encounter16$patient2 = _$Encounter16$patient[0]) === null || _$Encounter16$patient2 === void 0 ? void 0 : _$Encounter16$patient2.MRN,
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$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$Perso2.birthDay),
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : _$Appointment23.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment24 = _.Appointment) === null || _$Appointment24 === void 0 ? void 0 : _$Appointment24.start, "DD MMM,YYYY") : "", ",").concat((_ === 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") : ""),
-              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,
-              refNo: (_$Encounter$appointme5 = _ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : (_$Encounter19$appoint = _$Encounter19.appointmentId) === null || _$Encounter19$appoint === void 0 ? void 0 : _$Encounter19$appoint[0]) !== null && _$Encounter$appointme5 !== void 0 ? _$Encounter$appointme5 : "",
-              viewaction: JSON.stringify({
-                appNo: (_$Encounter$appointme6 = _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$appoint = _$Encounter20.appointmentId) === null || _$Encounter20$appoint === void 0 ? void 0 : _$Encounter20$appoint[0]) !== null && _$Encounter$appointme6 !== void 0 ? _$Encounter$appointme6 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$patient = _$Encounter21.patient_id) === null || _$Encounter21$patient === void 0 ? void 0 : (_$Encounter21$patient2 = _$Encounter21$patient[0]) === null || _$Encounter21$patient2 === void 0 ? void 0 : (_$Encounter21$patient3 = _$Encounter21$patient2.telecom) === null || _$Encounter21$patient3 === void 0 ? void 0 : (_$Encounter21$patient4 = _$Encounter21$patient3[0]) === null || _$Encounter21$patient4 === void 0 ? void 0 : _$Encounter21$patient4.value,
-                personId: (_$Appointment$PersonI8 = _ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : (_$Appointment27$Perso = _$Appointment27.PersonID) === null || _$Appointment27$Perso === void 0 ? void 0 : (_$Appointment27$Perso2 = _$Appointment27$Perso[0]) === null || _$Appointment27$Perso2 === void 0 ? void 0 : _$Appointment27$Perso2.Id) !== null && _$Appointment$PersonI8 !== void 0 ? _$Appointment$PersonI8 : null,
-                patientId: (_$Encounter$patient_i7 = _ === 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$patient2.id) !== null && _$Encounter$patient_i7 !== void 0 ? _$Encounter$patient_i7 : null
-              }),
-              modifyaction: JSON.stringify({
-                appNo: (_$Encounter$appointme7 = _ === null || _ === void 0 ? void 0 : (_$Encounter23 = _.Encounter) === null || _$Encounter23 === void 0 ? void 0 : (_$Encounter23$appoint = _$Encounter23.appointmentId) === null || _$Encounter23$appoint === void 0 ? void 0 : _$Encounter23$appoint[0]) !== null && _$Encounter$appointme7 !== void 0 ? _$Encounter$appointme7 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter24 = _.Encounter) === null || _$Encounter24 === void 0 ? void 0 : (_$Encounter24$patient = _$Encounter24.patient_id) === null || _$Encounter24$patient === void 0 ? void 0 : (_$Encounter24$patient2 = _$Encounter24$patient[0]) === null || _$Encounter24$patient2 === void 0 ? void 0 : (_$Encounter24$patient3 = _$Encounter24$patient2.telecom) === null || _$Encounter24$patient3 === void 0 ? void 0 : (_$Encounter24$patient4 = _$Encounter24$patient3[0]) === null || _$Encounter24$patient4 === void 0 ? void 0 : _$Encounter24$patient4.value,
-                personId: (_$Appointment$PersonI9 = _ === 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.Id) !== null && _$Appointment$PersonI9 !== void 0 ? _$Appointment$PersonI9 : null,
-                patientId: (_$Encounter$patient_i8 = _ === 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$patient2.id) !== null && _$Encounter$patient_i8 !== void 0 ? _$Encounter$patient_i8 : null
-              }),
-              cancelaction: JSON.stringify({
-                appNo: (_$Encounter$appointme8 = _ === null || _ === void 0 ? void 0 : (_$Encounter26 = _.Encounter) === null || _$Encounter26 === void 0 ? void 0 : (_$Encounter26$appoint = _$Encounter26.appointmentId) === null || _$Encounter26$appoint === void 0 ? void 0 : _$Encounter26$appoint[0]) !== null && _$Encounter$appointme8 !== void 0 ? _$Encounter$appointme8 : "",
+              name: makeName((_ === 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_3 = _$Encounter9$patient_2.name) === null || _$Encounter9$patient_3 === void 0 ? void 0 : _$Encounter9$patient_3[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: 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),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : _$Appointment20.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : _$Appointment21.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : _$Appointment22.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : _$Appointment23.start, "hh:mm A") : ""),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : _$Encounter11.visit_type,
+              appointmentStatus: (_$Encounter$status$di2 = _ === 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) !== null && _$Encounter$status$di2 !== void 0 ? _$Encounter$status$di2 : "",
+              refNo: (_$Encounter$appointme3 = _ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : (_$Encounter13$appoint = _$Encounter13.appointmentId) === null || _$Encounter13$appoint === void 0 ? void 0 : _$Encounter13$appoint[0]) !== null && _$Encounter$appointme3 !== void 0 ? _$Encounter$appointme3 : "",
+              action: JSON.stringify({
+                appNo: (_$Encounter$appointme4 = _ === 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$appointme4 !== void 0 ? _$Encounter$appointme4 : "",
                 enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : (_$Encounter27$patient = _$Encounter27.patient_id) === null || _$Encounter27$patient === void 0 ? void 0 : (_$Encounter27$patient2 = _$Encounter27$patient[0]) === null || _$Encounter27$patient2 === void 0 ? void 0 : (_$Encounter27$patient3 = _$Encounter27$patient2.telecom) === null || _$Encounter27$patient3 === void 0 ? void 0 : (_$Encounter27$patient4 = _$Encounter27$patient3[0]) === null || _$Encounter27$patient4 === void 0 ? void 0 : _$Encounter27$patient4.value,
-                personId: (_$Appointment$PersonI10 = _ === 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.Id) !== null && _$Appointment$PersonI10 !== void 0 ? _$Appointment$PersonI10 : null,
-                patientId: (_$Encounter$patient_i9 = _ === 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$patient2.id) !== null && _$Encounter$patient_i9 !== void 0 ? _$Encounter$patient_i9 : null
-              })
+                contact: _ === 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.telecom) === null || _$Encounter15$patient3 === void 0 ? void 0 : (_$Encounter15$patient4 = _$Encounter15$patient3[0]) === null || _$Encounter15$patient4 === void 0 ? void 0 : _$Encounter15$patient4.value,
+                personId: (_$Appointment$PersonI5 = _ === 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.Id) !== null && _$Appointment$PersonI5 !== void 0 ? _$Appointment$PersonI5 : null,
+                patientId: (_$Encounter$patient_i5 = _ === 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.id) !== null && _$Encounter$patient_i5 !== void 0 ? _$Encounter$patient_i5 : null
+              }) // modifyaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+              // cancelaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+
             };
           }) : [];
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38563,215 +38709,7 @@ 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 _$Encounter29, _$Encounter29$patient, _$Encounter29$patient2, _$Encounter29$patient3, _$Encounter30, _$Encounter30$patient, _$Encounter30$patient2, _$Appointment30, _$Appointment30$Perso, _$Appointment30$Perso2, _$Appointment31, _$Appointment32, _$Appointment33, _$Appointment34, _$Encounter31, _$Encounter32, _$Encounter32$status, _$Encounter$appointme9, _$Encounter33, _$Encounter33$appoint, _$Encounter$appointme10, _$Encounter34, _$Encounter34$appoint, _$Encounter35, _$Encounter35$patient, _$Encounter35$patient2, _$Encounter35$patient3, _$Encounter35$patient4, _$Appointment$PersonI11, _$Appointment35, _$Appointment35$Perso, _$Appointment35$Perso2, _$Encounter$patient_i10, _$Encounter36, _$Encounter36$patient, _$Encounter36$patient2, _$Encounter$appointme11, _$Encounter37, _$Encounter37$appoint, _$Encounter38, _$Encounter38$patient, _$Encounter38$patient2, _$Encounter38$patient3, _$Encounter38$patient4, _$Appointment$PersonI12, _$Appointment36, _$Appointment36$Perso, _$Appointment36$Perso2, _$Encounter$patient_i11, _$Encounter39, _$Encounter39$patient, _$Encounter39$patient2, _$Encounter$appointme12, _$Encounter40, _$Encounter40$appoint, _$Encounter41, _$Encounter41$patient, _$Encounter41$patient2, _$Encounter41$patient3, _$Encounter41$patient4, _$Appointment$PersonI13, _$Appointment37, _$Appointment37$Perso, _$Appointment37$Perso2, _$Encounter$patient_i12, _$Encounter42, _$Encounter42$patient, _$Encounter42$patient2;
-
-            return {
-              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
-              //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
-              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              // name: makeName(_?.Encounter?.patient_id?.[0]?.name?.[0] || {}),
-              // mrn: _?.Encounter?.patient_id?.[0]?.MRN,
-              // date: _?.Appointment?.start
-              //   ? utcTOLocal(_?.Appointment?.start, "DD MMM,YYYY")
-              //   : "",
-              // time: _?.Appointment?.start
-              //   ? utcTOLocal(_?.Appointment?.start, "hh:mm A")
-              //   : "",
-              // speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
-              //   return spl?.coding?.[0]?.display;
-              // }).join(", "),
-              // clinic: _?.Encounter?.practitioner_details?.[0]?.clinic,
-              // dob: _?.Appointment?.PersonID?.[0]?.birthDay,
-              // type: "OP",
-              // appNo: _?.Encounter?.appointmentId?.[0] ?? "",
-              // data: _,
-              // enId: _.Encounter.id,
-              // age: getAge(_?.Appointment?.PersonID?.[0]?.birthDay),
-              // gender: _?.Appointment?.PersonID?.[0]?.gender,
-              // contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
-              // visitType: _?.Encounter?.visit_type,
-              // appointmentStatus: _?.Encounter?.status?.display,
-              // "Register Visit": true,
-              // "Modify Appointment": true,
-              // "Cancel Appointment": true,
-              // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$patient = _$Encounter29.patient_id) === null || _$Encounter29$patient === void 0 ? void 0 : (_$Encounter29$patient2 = _$Encounter29$patient[0]) === null || _$Encounter29$patient2 === void 0 ? void 0 : (_$Encounter29$patient3 = _$Encounter29$patient2.name) === null || _$Encounter29$patient3 === void 0 ? void 0 : _$Encounter29$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$patient = _$Encounter30.patient_id) === null || _$Encounter30$patient === void 0 ? void 0 : (_$Encounter30$patient2 = _$Encounter30$patient[0]) === null || _$Encounter30$patient2 === void 0 ? void 0 : _$Encounter30$patient2.MRN,
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$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.birthDay),
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : _$Appointment31.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : _$Appointment32.start, "DD MMM,YYYY") : "", ",").concat((_ === 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, "hh:mm A") : ""),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter31 = _.Encounter) === null || _$Encounter31 === void 0 ? void 0 : _$Encounter31.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter32 = _.Encounter) === null || _$Encounter32 === void 0 ? void 0 : (_$Encounter32$status = _$Encounter32.status) === null || _$Encounter32$status === void 0 ? void 0 : _$Encounter32$status.display,
-              refNo: (_$Encounter$appointme9 = _ === null || _ === void 0 ? void 0 : (_$Encounter33 = _.Encounter) === null || _$Encounter33 === void 0 ? void 0 : (_$Encounter33$appoint = _$Encounter33.appointmentId) === null || _$Encounter33$appoint === void 0 ? void 0 : _$Encounter33$appoint[0]) !== null && _$Encounter$appointme9 !== void 0 ? _$Encounter$appointme9 : "",
-              viewaction: JSON.stringify({
-                appNo: (_$Encounter$appointme10 = _ === null || _ === void 0 ? void 0 : (_$Encounter34 = _.Encounter) === null || _$Encounter34 === void 0 ? void 0 : (_$Encounter34$appoint = _$Encounter34.appointmentId) === null || _$Encounter34$appoint === void 0 ? void 0 : _$Encounter34$appoint[0]) !== null && _$Encounter$appointme10 !== void 0 ? _$Encounter$appointme10 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : (_$Encounter35$patient = _$Encounter35.patient_id) === null || _$Encounter35$patient === void 0 ? void 0 : (_$Encounter35$patient2 = _$Encounter35$patient[0]) === null || _$Encounter35$patient2 === void 0 ? void 0 : (_$Encounter35$patient3 = _$Encounter35$patient2.telecom) === null || _$Encounter35$patient3 === void 0 ? void 0 : (_$Encounter35$patient4 = _$Encounter35$patient3[0]) === null || _$Encounter35$patient4 === void 0 ? void 0 : _$Encounter35$patient4.value,
-                personId: (_$Appointment$PersonI11 = _ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : (_$Appointment35$Perso = _$Appointment35.PersonID) === null || _$Appointment35$Perso === void 0 ? void 0 : (_$Appointment35$Perso2 = _$Appointment35$Perso[0]) === null || _$Appointment35$Perso2 === void 0 ? void 0 : _$Appointment35$Perso2.Id) !== null && _$Appointment$PersonI11 !== void 0 ? _$Appointment$PersonI11 : null,
-                patientId: (_$Encounter$patient_i10 = _ === 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$patient2.id) !== null && _$Encounter$patient_i10 !== void 0 ? _$Encounter$patient_i10 : null
-              }),
-              modifyaction: JSON.stringify({
-                appNo: (_$Encounter$appointme11 = _ === null || _ === void 0 ? void 0 : (_$Encounter37 = _.Encounter) === null || _$Encounter37 === void 0 ? void 0 : (_$Encounter37$appoint = _$Encounter37.appointmentId) === null || _$Encounter37$appoint === void 0 ? void 0 : _$Encounter37$appoint[0]) !== null && _$Encounter$appointme11 !== void 0 ? _$Encounter$appointme11 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter38 = _.Encounter) === null || _$Encounter38 === void 0 ? void 0 : (_$Encounter38$patient = _$Encounter38.patient_id) === null || _$Encounter38$patient === void 0 ? void 0 : (_$Encounter38$patient2 = _$Encounter38$patient[0]) === null || _$Encounter38$patient2 === void 0 ? void 0 : (_$Encounter38$patient3 = _$Encounter38$patient2.telecom) === null || _$Encounter38$patient3 === void 0 ? void 0 : (_$Encounter38$patient4 = _$Encounter38$patient3[0]) === null || _$Encounter38$patient4 === void 0 ? void 0 : _$Encounter38$patient4.value,
-                personId: (_$Appointment$PersonI12 = _ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : (_$Appointment36$Perso = _$Appointment36.PersonID) === null || _$Appointment36$Perso === void 0 ? void 0 : (_$Appointment36$Perso2 = _$Appointment36$Perso[0]) === null || _$Appointment36$Perso2 === void 0 ? void 0 : _$Appointment36$Perso2.Id) !== null && _$Appointment$PersonI12 !== void 0 ? _$Appointment$PersonI12 : null,
-                patientId: (_$Encounter$patient_i11 = _ === null || _ === void 0 ? void 0 : (_$Encounter39 = _.Encounter) === null || _$Encounter39 === void 0 ? void 0 : (_$Encounter39$patient = _$Encounter39.patient_id) === null || _$Encounter39$patient === void 0 ? void 0 : (_$Encounter39$patient2 = _$Encounter39$patient[0]) === null || _$Encounter39$patient2 === void 0 ? void 0 : _$Encounter39$patient2.id) !== null && _$Encounter$patient_i11 !== void 0 ? _$Encounter$patient_i11 : null
-              }),
-              cancelaction: JSON.stringify({
-                appNo: (_$Encounter$appointme12 = _ === null || _ === void 0 ? void 0 : (_$Encounter40 = _.Encounter) === null || _$Encounter40 === void 0 ? void 0 : (_$Encounter40$appoint = _$Encounter40.appointmentId) === null || _$Encounter40$appoint === void 0 ? void 0 : _$Encounter40$appoint[0]) !== null && _$Encounter$appointme12 !== void 0 ? _$Encounter$appointme12 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter41 = _.Encounter) === null || _$Encounter41 === void 0 ? void 0 : (_$Encounter41$patient = _$Encounter41.patient_id) === null || _$Encounter41$patient === void 0 ? void 0 : (_$Encounter41$patient2 = _$Encounter41$patient[0]) === null || _$Encounter41$patient2 === void 0 ? void 0 : (_$Encounter41$patient3 = _$Encounter41$patient2.telecom) === null || _$Encounter41$patient3 === void 0 ? void 0 : (_$Encounter41$patient4 = _$Encounter41$patient3[0]) === null || _$Encounter41$patient4 === void 0 ? void 0 : _$Encounter41$patient4.value,
-                personId: (_$Appointment$PersonI13 = _ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : (_$Appointment37$Perso = _$Appointment37.PersonID) === null || _$Appointment37$Perso === void 0 ? void 0 : (_$Appointment37$Perso2 = _$Appointment37$Perso[0]) === null || _$Appointment37$Perso2 === void 0 ? void 0 : _$Appointment37$Perso2.Id) !== null && _$Appointment$PersonI13 !== void 0 ? _$Appointment$PersonI13 : null,
-                patientId: (_$Encounter$patient_i12 = _ === null || _ === void 0 ? void 0 : (_$Encounter42 = _.Encounter) === null || _$Encounter42 === void 0 ? void 0 : (_$Encounter42$patient = _$Encounter42.patient_id) === null || _$Encounter42$patient === void 0 ? void 0 : (_$Encounter42$patient2 = _$Encounter42$patient[0]) === null || _$Encounter42$patient2 === void 0 ? void 0 : _$Encounter42$patient2.id) !== null && _$Encounter$patient_i12 !== void 0 ? _$Encounter$patient_i12 : null
-              })
-            };
-          }) : [];
-          return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-            data: returnedData
-          }));
-
-        case 10:
-          _context4.prev = 10;
-          _context4.t0 = _context4["catch"](2);
-          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context4.t0.message
-          })));
-
-        case 13:
-        case "end":
-          return _context4.stop();
-      }
-    }
-  }, _callee4, null, [[2, 10]]);
-})));
-var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-  var payload,
-      _ref10,
-      rejectWithValue,
-      _data$result5,
-      data,
-      returnedData,
-      _args5 = arguments;
-
-  return regeneratorRuntime.wrap(function _callee5$(_context5) {
-    while (1) {
-      switch (_context5.prev = _context5.next) {
-        case 0:
-          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
-          _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
-          _context5.prev = 2;
-          _context5.next = 5;
-          return fetchData$3({
-            body: JSON.stringify(query$4.getNewPatients(payload))
-          }, __readDocumentUrl__);
-
-        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 _$Encounter43, _$Encounter43$patient, _$Encounter43$patient2, _$Encounter43$patient3, _$Encounter44, _$Encounter44$patient, _$Encounter44$patient2, _$Appointment38, _$Appointment38$Perso, _$Appointment38$Perso2, _$Appointment39, _$Appointment40, _$Appointment41, _$Appointment42, _$Encounter45, _$Encounter46, _$Encounter46$status, _$Encounter$appointme13, _$Encounter47, _$Encounter47$appoint, _$Encounter$appointme14, _$Encounter48, _$Encounter48$appoint, _$Encounter49, _$Encounter49$patient, _$Encounter49$patient2, _$Encounter49$patient3, _$Encounter49$patient4, _$Appointment$PersonI14, _$Appointment43, _$Appointment43$Perso, _$Appointment43$Perso2, _$Encounter$patient_i13, _$Encounter50, _$Encounter50$patient, _$Encounter50$patient2, _$Encounter$appointme15, _$Encounter51, _$Encounter51$appoint, _$Encounter52, _$Encounter52$patient, _$Encounter52$patient2, _$Encounter52$patient3, _$Encounter52$patient4, _$Appointment$PersonI15, _$Appointment44, _$Appointment44$Perso, _$Appointment44$Perso2, _$Encounter$patient_i14, _$Encounter53, _$Encounter53$patient, _$Encounter53$patient2, _$Encounter$appointme16, _$Encounter54, _$Encounter54$appoint, _$Encounter55, _$Encounter55$patient, _$Encounter55$patient2, _$Encounter55$patient3, _$Encounter55$patient4, _$Appointment$PersonI16, _$Appointment45, _$Appointment45$Perso, _$Appointment45$Perso2, _$Encounter$patient_i15, _$Encounter56, _$Encounter56$patient, _$Encounter56$patient2;
-
-            return {
-              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
-              //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
-              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              // name: makeName(_?.Encounter?.patient_id?.[0]?.name?.[0] || {}),
-              // mrn: _?.Encounter?.patient_id?.[0]?.MRN,
-              // date: _?.Appointment?.start
-              //   ? utcTOLocal(_?.Appointment?.start, "DD MMM,YYYY")
-              //   : "",
-              // time: _?.Appointment?.start
-              //   ? utcTOLocal(_?.Appointment?.start, "hh:mm A")
-              //   : "",
-              // speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
-              //   return spl?.coding?.[0]?.display;
-              // }).join(", "),
-              // clinic: _?.Encounter?.practitioner_details?.[0]?.clinic,
-              // dob: _?.Appointment?.PersonID?.[0]?.birthDay,
-              // type: "OP",
-              // appNo: _?.Encounter?.appointmentId?.[0] ?? "",
-              // data: _,
-              // enId: _.Encounter.id,
-              // age: getAge(_?.Appointment?.PersonID?.[0]?.birthDay),
-              // gender: _?.Appointment?.PersonID?.[0]?.gender,
-              // contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
-              // visitType: _?.Encounter?.visit_type,
-              // appointmentStatus: _?.Encounter?.status?.display,
-              // "Register Visit": true,
-              // "Modify Appointment": true,
-              // "Cancel Appointment": true,
-              // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter43 = _.Encounter) === null || _$Encounter43 === void 0 ? void 0 : (_$Encounter43$patient = _$Encounter43.patient_id) === null || _$Encounter43$patient === void 0 ? void 0 : (_$Encounter43$patient2 = _$Encounter43$patient[0]) === null || _$Encounter43$patient2 === void 0 ? void 0 : (_$Encounter43$patient3 = _$Encounter43$patient2.name) === null || _$Encounter43$patient3 === void 0 ? void 0 : _$Encounter43$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter44 = _.Encounter) === null || _$Encounter44 === void 0 ? void 0 : (_$Encounter44$patient = _$Encounter44.patient_id) === null || _$Encounter44$patient === void 0 ? void 0 : (_$Encounter44$patient2 = _$Encounter44$patient[0]) === null || _$Encounter44$patient2 === void 0 ? void 0 : _$Encounter44$patient2.MRN,
-              age: getAge(_ === 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),
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : _$Appointment39.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : _$Appointment40.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : _$Appointment41.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment42 = _.Appointment) === null || _$Appointment42 === void 0 ? void 0 : _$Appointment42.start, "hh:mm A") : ""),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter45 = _.Encounter) === null || _$Encounter45 === void 0 ? void 0 : _$Encounter45.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter46 = _.Encounter) === null || _$Encounter46 === void 0 ? void 0 : (_$Encounter46$status = _$Encounter46.status) === null || _$Encounter46$status === void 0 ? void 0 : _$Encounter46$status.display,
-              refNo: (_$Encounter$appointme13 = _ === null || _ === void 0 ? void 0 : (_$Encounter47 = _.Encounter) === null || _$Encounter47 === void 0 ? void 0 : (_$Encounter47$appoint = _$Encounter47.appointmentId) === null || _$Encounter47$appoint === void 0 ? void 0 : _$Encounter47$appoint[0]) !== null && _$Encounter$appointme13 !== void 0 ? _$Encounter$appointme13 : "",
-              viewaction: JSON.stringify({
-                appNo: (_$Encounter$appointme14 = _ === null || _ === void 0 ? void 0 : (_$Encounter48 = _.Encounter) === null || _$Encounter48 === void 0 ? void 0 : (_$Encounter48$appoint = _$Encounter48.appointmentId) === null || _$Encounter48$appoint === void 0 ? void 0 : _$Encounter48$appoint[0]) !== null && _$Encounter$appointme14 !== void 0 ? _$Encounter$appointme14 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter49 = _.Encounter) === null || _$Encounter49 === void 0 ? void 0 : (_$Encounter49$patient = _$Encounter49.patient_id) === null || _$Encounter49$patient === void 0 ? void 0 : (_$Encounter49$patient2 = _$Encounter49$patient[0]) === null || _$Encounter49$patient2 === void 0 ? void 0 : (_$Encounter49$patient3 = _$Encounter49$patient2.telecom) === null || _$Encounter49$patient3 === void 0 ? void 0 : (_$Encounter49$patient4 = _$Encounter49$patient3[0]) === null || _$Encounter49$patient4 === void 0 ? void 0 : _$Encounter49$patient4.value,
-                personId: (_$Appointment$PersonI14 = _ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : (_$Appointment43$Perso = _$Appointment43.PersonID) === null || _$Appointment43$Perso === void 0 ? void 0 : (_$Appointment43$Perso2 = _$Appointment43$Perso[0]) === null || _$Appointment43$Perso2 === void 0 ? void 0 : _$Appointment43$Perso2.Id) !== null && _$Appointment$PersonI14 !== void 0 ? _$Appointment$PersonI14 : null,
-                patientId: (_$Encounter$patient_i13 = _ === null || _ === void 0 ? void 0 : (_$Encounter50 = _.Encounter) === null || _$Encounter50 === void 0 ? void 0 : (_$Encounter50$patient = _$Encounter50.patient_id) === null || _$Encounter50$patient === void 0 ? void 0 : (_$Encounter50$patient2 = _$Encounter50$patient[0]) === null || _$Encounter50$patient2 === void 0 ? void 0 : _$Encounter50$patient2.id) !== null && _$Encounter$patient_i13 !== void 0 ? _$Encounter$patient_i13 : null
-              }),
-              modifyaction: JSON.stringify({
-                appNo: (_$Encounter$appointme15 = _ === null || _ === void 0 ? void 0 : (_$Encounter51 = _.Encounter) === null || _$Encounter51 === void 0 ? void 0 : (_$Encounter51$appoint = _$Encounter51.appointmentId) === null || _$Encounter51$appoint === void 0 ? void 0 : _$Encounter51$appoint[0]) !== null && _$Encounter$appointme15 !== void 0 ? _$Encounter$appointme15 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter52 = _.Encounter) === null || _$Encounter52 === void 0 ? void 0 : (_$Encounter52$patient = _$Encounter52.patient_id) === null || _$Encounter52$patient === void 0 ? void 0 : (_$Encounter52$patient2 = _$Encounter52$patient[0]) === null || _$Encounter52$patient2 === void 0 ? void 0 : (_$Encounter52$patient3 = _$Encounter52$patient2.telecom) === null || _$Encounter52$patient3 === void 0 ? void 0 : (_$Encounter52$patient4 = _$Encounter52$patient3[0]) === null || _$Encounter52$patient4 === void 0 ? void 0 : _$Encounter52$patient4.value,
-                personId: (_$Appointment$PersonI15 = _ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : (_$Appointment44$Perso = _$Appointment44.PersonID) === null || _$Appointment44$Perso === void 0 ? void 0 : (_$Appointment44$Perso2 = _$Appointment44$Perso[0]) === null || _$Appointment44$Perso2 === void 0 ? void 0 : _$Appointment44$Perso2.Id) !== null && _$Appointment$PersonI15 !== void 0 ? _$Appointment$PersonI15 : null,
-                patientId: (_$Encounter$patient_i14 = _ === null || _ === void 0 ? void 0 : (_$Encounter53 = _.Encounter) === null || _$Encounter53 === void 0 ? void 0 : (_$Encounter53$patient = _$Encounter53.patient_id) === null || _$Encounter53$patient === void 0 ? void 0 : (_$Encounter53$patient2 = _$Encounter53$patient[0]) === null || _$Encounter53$patient2 === void 0 ? void 0 : _$Encounter53$patient2.id) !== null && _$Encounter$patient_i14 !== void 0 ? _$Encounter$patient_i14 : null
-              }),
-              cancelaction: JSON.stringify({
-                appNo: (_$Encounter$appointme16 = _ === null || _ === void 0 ? void 0 : (_$Encounter54 = _.Encounter) === null || _$Encounter54 === void 0 ? void 0 : (_$Encounter54$appoint = _$Encounter54.appointmentId) === null || _$Encounter54$appoint === void 0 ? void 0 : _$Encounter54$appoint[0]) !== null && _$Encounter$appointme16 !== void 0 ? _$Encounter$appointme16 : "",
-                enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter55 = _.Encounter) === null || _$Encounter55 === void 0 ? void 0 : (_$Encounter55$patient = _$Encounter55.patient_id) === null || _$Encounter55$patient === void 0 ? void 0 : (_$Encounter55$patient2 = _$Encounter55$patient[0]) === null || _$Encounter55$patient2 === void 0 ? void 0 : (_$Encounter55$patient3 = _$Encounter55$patient2.telecom) === null || _$Encounter55$patient3 === void 0 ? void 0 : (_$Encounter55$patient4 = _$Encounter55$patient3[0]) === null || _$Encounter55$patient4 === void 0 ? void 0 : _$Encounter55$patient4.value,
-                personId: (_$Appointment$PersonI16 = _ === null || _ === void 0 ? void 0 : (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : (_$Appointment45$Perso = _$Appointment45.PersonID) === null || _$Appointment45$Perso === void 0 ? void 0 : (_$Appointment45$Perso2 = _$Appointment45$Perso[0]) === null || _$Appointment45$Perso2 === void 0 ? void 0 : _$Appointment45$Perso2.Id) !== null && _$Appointment$PersonI16 !== void 0 ? _$Appointment$PersonI16 : null,
-                patientId: (_$Encounter$patient_i15 = _ === null || _ === void 0 ? void 0 : (_$Encounter56 = _.Encounter) === null || _$Encounter56 === void 0 ? void 0 : (_$Encounter56$patient = _$Encounter56.patient_id) === null || _$Encounter56$patient === void 0 ? void 0 : (_$Encounter56$patient2 = _$Encounter56$patient[0]) === null || _$Encounter56$patient2 === void 0 ? void 0 : _$Encounter56$patient2.id) !== null && _$Encounter$patient_i15 !== void 0 ? _$Encounter$patient_i15 : null
-              })
-            };
-          }) : [];
-          return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-            data: returnedData
-          }));
-
-        case 10:
-          _context5.prev = 10;
-          _context5.t0 = _context5["catch"](2);
-          return _context5.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context5.t0.message
-          })));
-
-        case 13:
-        case "end":
-          return _context5.stop();
-      }
-    }
-  }, _callee5, null, [[2, 10]]);
-})));
-var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-  var payload,
-      _ref12,
-      rejectWithValue,
-      _data$result6,
-      data,
-      returnedData,
-      _args6 = arguments;
-
-  return regeneratorRuntime.wrap(function _callee6$(_context6) {
-    while (1) {
-      switch (_context6.prev = _context6.next) {
-        case 0:
-          payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
-          _ref12 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref12.rejectWithValue;
-          _context6.prev = 2;
-          _context6.next = 5;
-          return fetchData$3({
-            body: JSON.stringify(query$4.getTodayVisits(payload))
-          }, __readDocumentUrl__);
-
-        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 _$Encounter57, _$Encounter57$patient, _$Encounter57$patient2, _$Encounter57$patient3, _$Encounter58, _$Encounter58$patient, _$Encounter58$patient2, _$Appointment46, _$Appointment46$Perso, _$Appointment46$Perso2, _$Appointment47, _$Appointment48, _$Appointment49, _$Appointment50, _$Encounter59, _$Encounter60, _$Encounter60$status, _$Encounter$appointme17, _$Encounter61, _$Encounter61$appoint, _$Encounter$appointme18, _$Encounter62, _$Encounter62$appoint, _$Encounter63, _$Encounter63$patient, _$Encounter63$patient2, _$Encounter63$patient3, _$Encounter63$patient4, _$Appointment$PersonI17, _$Appointment51, _$Appointment51$Perso, _$Appointment51$Perso2, _$Encounter$patient_i16, _$Encounter64, _$Encounter64$patient, _$Encounter64$patient2, _$Encounter$appointme19, _$Encounter65, _$Encounter65$appoint, _$Encounter66, _$Encounter66$patient, _$Encounter66$patient2, _$Encounter66$patient3, _$Encounter66$patient4, _$Appointment$PersonI18, _$Appointment52, _$Appointment52$Perso, _$Appointment52$Perso2, _$Encounter$patient_i17, _$Encounter67, _$Encounter67$patient, _$Encounter67$patient2, _$Encounter$appointme20, _$Encounter68, _$Encounter68$appoint, _$Encounter69, _$Encounter69$patient, _$Encounter69$patient2, _$Encounter69$patient3, _$Encounter69$patient4, _$Appointment$PersonI19, _$Appointment53, _$Appointment53$Perso, _$Appointment53$Perso2, _$Encounter$patient_i18, _$Encounter70, _$Encounter70$patient, _$Encounter70$patient2;
+            var _$Encounter17, _$Encounter17$patient, _$Encounter17$patient2, _$Encounter17$patient3, _$Encounter18, _$Encounter18$patient, _$Encounter18$patient2, _$Appointment25, _$Appointment25$Perso, _$Appointment25$Perso2, _$Appointment26, _$Appointment27, _$Appointment28, _$Appointment29, _$Encounter19, _$Encounter$status$di3, _$Encounter20, _$Encounter20$status, _$Encounter$appointme5, _$Encounter21, _$Encounter21$appoint, _$Encounter$appointme6, _$Encounter22, _$Encounter22$appoint, _$Encounter23, _$Encounter23$patient, _$Encounter23$patient2, _$Encounter23$patient3, _$Encounter23$patient4, _$Appointment$PersonI6, _$Appointment30, _$Appointment30$Perso, _$Appointment30$Perso2, _$Encounter$patient_i6, _$Encounter24, _$Encounter24$patient, _$Encounter24$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38803,34 +38741,242 @@ var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits
               // "Modify Appointment": true,
               // "Cancel Appointment": true,
               // "View Profile": true,
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter57 = _.Encounter) === null || _$Encounter57 === void 0 ? void 0 : (_$Encounter57$patient = _$Encounter57.patient_id) === null || _$Encounter57$patient === void 0 ? void 0 : (_$Encounter57$patient2 = _$Encounter57$patient[0]) === null || _$Encounter57$patient2 === void 0 ? void 0 : (_$Encounter57$patient3 = _$Encounter57$patient2.name) === null || _$Encounter57$patient3 === void 0 ? void 0 : _$Encounter57$patient3[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter58 = _.Encounter) === null || _$Encounter58 === void 0 ? void 0 : (_$Encounter58$patient = _$Encounter58.patient_id) === null || _$Encounter58$patient === void 0 ? void 0 : (_$Encounter58$patient2 = _$Encounter58$patient[0]) === null || _$Encounter58$patient2 === void 0 ? void 0 : _$Encounter58$patient2.MRN,
-              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment46 = _.Appointment) === null || _$Appointment46 === void 0 ? void 0 : (_$Appointment46$Perso = _$Appointment46.PersonID) === null || _$Appointment46$Perso === void 0 ? void 0 : (_$Appointment46$Perso2 = _$Appointment46$Perso[0]) === null || _$Appointment46$Perso2 === void 0 ? void 0 : _$Appointment46$Perso2.birthDay),
-              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment47 = _.Appointment) === null || _$Appointment47 === void 0 ? void 0 : _$Appointment47.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment48 = _.Appointment) === null || _$Appointment48 === void 0 ? void 0 : _$Appointment48.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment49 = _.Appointment) === null || _$Appointment49 === void 0 ? void 0 : _$Appointment49.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment50 = _.Appointment) === null || _$Appointment50 === void 0 ? void 0 : _$Appointment50.start, "hh:mm A") : ""),
-              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter59 = _.Encounter) === null || _$Encounter59 === void 0 ? void 0 : _$Encounter59.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter60 = _.Encounter) === null || _$Encounter60 === void 0 ? void 0 : (_$Encounter60$status = _$Encounter60.status) === null || _$Encounter60$status === void 0 ? void 0 : _$Encounter60$status.display,
-              refNo: (_$Encounter$appointme17 = _ === null || _ === void 0 ? void 0 : (_$Encounter61 = _.Encounter) === null || _$Encounter61 === void 0 ? void 0 : (_$Encounter61$appoint = _$Encounter61.appointmentId) === null || _$Encounter61$appoint === void 0 ? void 0 : _$Encounter61$appoint[0]) !== null && _$Encounter$appointme17 !== void 0 ? _$Encounter$appointme17 : "",
-              viewaction: JSON.stringify({
-                appNo: (_$Encounter$appointme18 = _ === null || _ === void 0 ? void 0 : (_$Encounter62 = _.Encounter) === null || _$Encounter62 === void 0 ? void 0 : (_$Encounter62$appoint = _$Encounter62.appointmentId) === null || _$Encounter62$appoint === void 0 ? void 0 : _$Encounter62$appoint[0]) !== null && _$Encounter$appointme18 !== void 0 ? _$Encounter$appointme18 : "",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter17 = _.Encounter) === null || _$Encounter17 === void 0 ? void 0 : (_$Encounter17$patient = _$Encounter17.patient_id) === null || _$Encounter17$patient === void 0 ? void 0 : (_$Encounter17$patient2 = _$Encounter17$patient[0]) === null || _$Encounter17$patient2 === void 0 ? void 0 : (_$Encounter17$patient3 = _$Encounter17$patient2.name) === null || _$Encounter17$patient3 === void 0 ? void 0 : _$Encounter17$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter18 = _.Encounter) === null || _$Encounter18 === void 0 ? void 0 : (_$Encounter18$patient = _$Encounter18.patient_id) === null || _$Encounter18$patient === void 0 ? void 0 : (_$Encounter18$patient2 = _$Encounter18$patient[0]) === null || _$Encounter18$patient2 === void 0 ? void 0 : _$Encounter18$patient2.MRN,
+              age: getAge(_ === 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$Perso2.birthDay),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment26 = _.Appointment) === null || _$Appointment26 === void 0 ? void 0 : _$Appointment26.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : _$Appointment27.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : _$Appointment28.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : _$Appointment29.start, "hh:mm A") : ""),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : _$Encounter19.visit_type,
+              appointmentStatus: (_$Encounter$status$di3 = _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$status = _$Encounter20.status) === null || _$Encounter20$status === void 0 ? void 0 : _$Encounter20$status.display) !== null && _$Encounter$status$di3 !== void 0 ? _$Encounter$status$di3 : "",
+              refNo: (_$Encounter$appointme5 = _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$appoint = _$Encounter21.appointmentId) === null || _$Encounter21$appoint === void 0 ? void 0 : _$Encounter21$appoint[0]) !== null && _$Encounter$appointme5 !== void 0 ? _$Encounter$appointme5 : "",
+              action: JSON.stringify({
+                appNo: (_$Encounter$appointme6 = _ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$appoint = _$Encounter22.appointmentId) === null || _$Encounter22$appoint === void 0 ? void 0 : _$Encounter22$appoint[0]) !== null && _$Encounter$appointme6 !== void 0 ? _$Encounter$appointme6 : "",
                 enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter63 = _.Encounter) === null || _$Encounter63 === void 0 ? void 0 : (_$Encounter63$patient = _$Encounter63.patient_id) === null || _$Encounter63$patient === void 0 ? void 0 : (_$Encounter63$patient2 = _$Encounter63$patient[0]) === null || _$Encounter63$patient2 === void 0 ? void 0 : (_$Encounter63$patient3 = _$Encounter63$patient2.telecom) === null || _$Encounter63$patient3 === void 0 ? void 0 : (_$Encounter63$patient4 = _$Encounter63$patient3[0]) === null || _$Encounter63$patient4 === void 0 ? void 0 : _$Encounter63$patient4.value,
-                personId: (_$Appointment$PersonI17 = _ === 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$Perso2.Id) !== null && _$Appointment$PersonI17 !== void 0 ? _$Appointment$PersonI17 : null,
-                patientId: (_$Encounter$patient_i16 = _ === null || _ === void 0 ? void 0 : (_$Encounter64 = _.Encounter) === null || _$Encounter64 === void 0 ? void 0 : (_$Encounter64$patient = _$Encounter64.patient_id) === null || _$Encounter64$patient === void 0 ? void 0 : (_$Encounter64$patient2 = _$Encounter64$patient[0]) === null || _$Encounter64$patient2 === void 0 ? void 0 : _$Encounter64$patient2.id) !== null && _$Encounter$patient_i16 !== void 0 ? _$Encounter$patient_i16 : null
-              }),
-              modifyaction: JSON.stringify({
-                appNo: (_$Encounter$appointme19 = _ === null || _ === void 0 ? void 0 : (_$Encounter65 = _.Encounter) === null || _$Encounter65 === void 0 ? void 0 : (_$Encounter65$appoint = _$Encounter65.appointmentId) === null || _$Encounter65$appoint === void 0 ? void 0 : _$Encounter65$appoint[0]) !== null && _$Encounter$appointme19 !== void 0 ? _$Encounter$appointme19 : "",
+                contact: _ === 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$patient3 = _$Encounter23$patient2.telecom) === null || _$Encounter23$patient3 === void 0 ? void 0 : (_$Encounter23$patient4 = _$Encounter23$patient3[0]) === null || _$Encounter23$patient4 === void 0 ? void 0 : _$Encounter23$patient4.value,
+                personId: (_$Appointment$PersonI6 = _ === 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.Id) !== null && _$Appointment$PersonI6 !== void 0 ? _$Appointment$PersonI6 : null,
+                patientId: (_$Encounter$patient_i6 = _ === null || _ === void 0 ? void 0 : (_$Encounter24 = _.Encounter) === null || _$Encounter24 === void 0 ? void 0 : (_$Encounter24$patient = _$Encounter24.patient_id) === null || _$Encounter24$patient === void 0 ? void 0 : (_$Encounter24$patient2 = _$Encounter24$patient[0]) === null || _$Encounter24$patient2 === void 0 ? void 0 : _$Encounter24$patient2.id) !== null && _$Encounter$patient_i6 !== void 0 ? _$Encounter$patient_i6 : null
+              }) // modifyaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+              // cancelaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+
+            };
+          }) : [];
+          return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: returnedData
+          }));
+
+        case 10:
+          _context4.prev = 10;
+          _context4.t0 = _context4["catch"](2);
+          return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context4.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context4.stop();
+      }
+    }
+  }, _callee4, null, [[2, 10]]);
+})));
+var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
+  var payload,
+      _ref10,
+      rejectWithValue,
+      _data$result5,
+      data,
+      returnedData,
+      _args5 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee5$(_context5) {
+    while (1) {
+      switch (_context5.prev = _context5.next) {
+        case 0:
+          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+          _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
+          _context5.prev = 2;
+          _context5.next = 5;
+          return fetchData$3({
+            body: JSON.stringify(query$4.getNewPatients(payload))
+          }, __readDocumentUrl__);
+
+        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 _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter25$patient3, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Appointment31, _$Appointment31$Perso, _$Appointment31$Perso2, _$Appointment32, _$Appointment33, _$Appointment34, _$Appointment35, _$Encounter27, _$Encounter$status$di4, _$Encounter28, _$Encounter28$status, _$Encounter$appointme7, _$Encounter29, _$Encounter29$appoint, _$Encounter$appointme8, _$Encounter30, _$Encounter30$appoint, _$Encounter31, _$Encounter31$patient, _$Encounter31$patient2, _$Encounter31$patient3, _$Encounter31$patient4, _$Appointment$PersonI7, _$Appointment36, _$Appointment36$Perso, _$Appointment36$Perso2, _$Encounter$patient_i7, _$Encounter32, _$Encounter32$patient, _$Encounter32$patient2;
+
+            return {
+              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // name: makeName(_?.Encounter?.patient_id?.[0]?.name?.[0] || {}),
+              // mrn: _?.Encounter?.patient_id?.[0]?.MRN,
+              // date: _?.Appointment?.start
+              //   ? utcTOLocal(_?.Appointment?.start, "DD MMM,YYYY")
+              //   : "",
+              // time: _?.Appointment?.start
+              //   ? utcTOLocal(_?.Appointment?.start, "hh:mm A")
+              //   : "",
+              // speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
+              //   return spl?.coding?.[0]?.display;
+              // }).join(", "),
+              // clinic: _?.Encounter?.practitioner_details?.[0]?.clinic,
+              // dob: _?.Appointment?.PersonID?.[0]?.birthDay,
+              // type: "OP",
+              // appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              // data: _,
+              // enId: _.Encounter.id,
+              // age: getAge(_?.Appointment?.PersonID?.[0]?.birthDay),
+              // gender: _?.Appointment?.PersonID?.[0]?.gender,
+              // contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              // visitType: _?.Encounter?.visit_type,
+              // appointmentStatus: _?.Encounter?.status?.display,
+              // "Register Visit": true,
+              // "Modify Appointment": true,
+              // "Cancel Appointment": true,
+              // "View Profile": true,
+              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,
+              age: getAge(_ === 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$Perso2.birthDay),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : _$Appointment32.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment33 = _.Appointment) === null || _$Appointment33 === void 0 ? void 0 : _$Appointment33.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : _$Appointment34.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start, "hh:mm A") : ""),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : _$Encounter27.visit_type,
+              appointmentStatus: (_$Encounter$status$di4 = _ === 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) !== null && _$Encounter$status$di4 !== void 0 ? _$Encounter$status$di4 : "",
+              refNo: (_$Encounter$appointme7 = _ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$appoint = _$Encounter29.appointmentId) === null || _$Encounter29$appoint === void 0 ? void 0 : _$Encounter29$appoint[0]) !== null && _$Encounter$appointme7 !== void 0 ? _$Encounter$appointme7 : "",
+              action: JSON.stringify({
+                appNo: (_$Encounter$appointme8 = _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$appoint = _$Encounter30.appointmentId) === null || _$Encounter30$appoint === void 0 ? void 0 : _$Encounter30$appoint[0]) !== null && _$Encounter$appointme8 !== void 0 ? _$Encounter$appointme8 : "",
                 enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter66 = _.Encounter) === null || _$Encounter66 === void 0 ? void 0 : (_$Encounter66$patient = _$Encounter66.patient_id) === null || _$Encounter66$patient === void 0 ? void 0 : (_$Encounter66$patient2 = _$Encounter66$patient[0]) === null || _$Encounter66$patient2 === void 0 ? void 0 : (_$Encounter66$patient3 = _$Encounter66$patient2.telecom) === null || _$Encounter66$patient3 === void 0 ? void 0 : (_$Encounter66$patient4 = _$Encounter66$patient3[0]) === null || _$Encounter66$patient4 === void 0 ? void 0 : _$Encounter66$patient4.value,
-                personId: (_$Appointment$PersonI18 = _ === 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$Perso2.Id) !== null && _$Appointment$PersonI18 !== void 0 ? _$Appointment$PersonI18 : null,
-                patientId: (_$Encounter$patient_i17 = _ === null || _ === void 0 ? void 0 : (_$Encounter67 = _.Encounter) === null || _$Encounter67 === void 0 ? void 0 : (_$Encounter67$patient = _$Encounter67.patient_id) === null || _$Encounter67$patient === void 0 ? void 0 : (_$Encounter67$patient2 = _$Encounter67$patient[0]) === null || _$Encounter67$patient2 === void 0 ? void 0 : _$Encounter67$patient2.id) !== null && _$Encounter$patient_i17 !== void 0 ? _$Encounter$patient_i17 : null
-              }),
-              cancelaction: JSON.stringify({
-                appNo: (_$Encounter$appointme20 = _ === null || _ === void 0 ? void 0 : (_$Encounter68 = _.Encounter) === null || _$Encounter68 === void 0 ? void 0 : (_$Encounter68$appoint = _$Encounter68.appointmentId) === null || _$Encounter68$appoint === void 0 ? void 0 : _$Encounter68$appoint[0]) !== null && _$Encounter$appointme20 !== void 0 ? _$Encounter$appointme20 : "",
+                contact: _ === 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.telecom) === null || _$Encounter31$patient3 === void 0 ? void 0 : (_$Encounter31$patient4 = _$Encounter31$patient3[0]) === null || _$Encounter31$patient4 === void 0 ? void 0 : _$Encounter31$patient4.value,
+                personId: (_$Appointment$PersonI7 = _ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : (_$Appointment36$Perso = _$Appointment36.PersonID) === null || _$Appointment36$Perso === void 0 ? void 0 : (_$Appointment36$Perso2 = _$Appointment36$Perso[0]) === null || _$Appointment36$Perso2 === void 0 ? void 0 : _$Appointment36$Perso2.Id) !== null && _$Appointment$PersonI7 !== void 0 ? _$Appointment$PersonI7 : null,
+                patientId: (_$Encounter$patient_i7 = _ === 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.id) !== null && _$Encounter$patient_i7 !== void 0 ? _$Encounter$patient_i7 : null
+              }) // modifyaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+              // cancelaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+
+            };
+          }) : [];
+          return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: returnedData
+          }));
+
+        case 10:
+          _context5.prev = 10;
+          _context5.t0 = _context5["catch"](2);
+          return _context5.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context5.t0.message
+          })));
+
+        case 13:
+        case "end":
+          return _context5.stop();
+      }
+    }
+  }, _callee5, null, [[2, 10]]);
+})));
+var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
+  var payload,
+      _ref12,
+      rejectWithValue,
+      _data$result6,
+      data,
+      returnedData,
+      _args6 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee6$(_context6) {
+    while (1) {
+      switch (_context6.prev = _context6.next) {
+        case 0:
+          payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          _ref12 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref12.rejectWithValue;
+          _context6.prev = 2;
+          _context6.next = 5;
+          return fetchData$3({
+            body: JSON.stringify(query$4.getTodayVisits(payload))
+          }, __readDocumentUrl__);
+
+        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 _$Encounter33, _$Encounter33$patient, _$Encounter33$patient2, _$Encounter33$patient3, _$Encounter34, _$Encounter34$patient, _$Encounter34$patient2, _$Appointment37, _$Appointment37$Perso, _$Appointment37$Perso2, _$Appointment38, _$Appointment39, _$Appointment40, _$Appointment41, _$Encounter35, _$Encounter$status$di5, _$Encounter36, _$Encounter36$status, _$Encounter$appointme9, _$Encounter37, _$Encounter37$appoint, _$Encounter$appointme10, _$Encounter38, _$Encounter38$appoint, _$Encounter39, _$Encounter39$patient, _$Encounter39$patient2, _$Encounter39$patient3, _$Encounter39$patient4, _$Appointment$PersonI8, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Encounter$patient_i8, _$Encounter40, _$Encounter40$patient, _$Encounter40$patient2;
+
+            return {
+              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(_?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // name: makeName(_?.Encounter?.patient_id?.[0]?.name?.[0] || {}),
+              // mrn: _?.Encounter?.patient_id?.[0]?.MRN,
+              // date: _?.Appointment?.start
+              //   ? utcTOLocal(_?.Appointment?.start, "DD MMM,YYYY")
+              //   : "",
+              // time: _?.Appointment?.start
+              //   ? utcTOLocal(_?.Appointment?.start, "hh:mm A")
+              //   : "",
+              // speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
+              //   return spl?.coding?.[0]?.display;
+              // }).join(", "),
+              // clinic: _?.Encounter?.practitioner_details?.[0]?.clinic,
+              // dob: _?.Appointment?.PersonID?.[0]?.birthDay,
+              // type: "OP",
+              // appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              // data: _,
+              // enId: _.Encounter.id,
+              // age: getAge(_?.Appointment?.PersonID?.[0]?.birthDay),
+              // gender: _?.Appointment?.PersonID?.[0]?.gender,
+              // contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              // visitType: _?.Encounter?.visit_type,
+              // appointmentStatus: _?.Encounter?.status?.display,
+              // "Register Visit": true,
+              // "Modify Appointment": true,
+              // "Cancel Appointment": true,
+              // "View Profile": true,
+              name: makeName((_ === 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.name) === null || _$Encounter33$patient3 === void 0 ? void 0 : _$Encounter33$patient3[0]) || {}),
+              mrn: _ === 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$patient2.MRN,
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : (_$Appointment37$Perso = _$Appointment37.PersonID) === null || _$Appointment37$Perso === void 0 ? void 0 : (_$Appointment37$Perso2 = _$Appointment37$Perso[0]) === null || _$Appointment37$Perso2 === void 0 ? void 0 : _$Appointment37$Perso2.birthDay),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : _$Appointment38.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : _$Appointment39.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : _$Appointment40.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : _$Appointment41.start, "hh:mm A") : ""),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : _$Encounter35.visit_type,
+              appointmentStatus: (_$Encounter$status$di5 = _ === 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) !== null && _$Encounter$status$di5 !== void 0 ? _$Encounter$status$di5 : "",
+              refNo: (_$Encounter$appointme9 = _ === null || _ === void 0 ? void 0 : (_$Encounter37 = _.Encounter) === null || _$Encounter37 === void 0 ? void 0 : (_$Encounter37$appoint = _$Encounter37.appointmentId) === null || _$Encounter37$appoint === void 0 ? void 0 : _$Encounter37$appoint[0]) !== null && _$Encounter$appointme9 !== void 0 ? _$Encounter$appointme9 : "",
+              action: JSON.stringify({
+                appNo: (_$Encounter$appointme10 = _ === null || _ === void 0 ? void 0 : (_$Encounter38 = _.Encounter) === null || _$Encounter38 === void 0 ? void 0 : (_$Encounter38$appoint = _$Encounter38.appointmentId) === null || _$Encounter38$appoint === void 0 ? void 0 : _$Encounter38$appoint[0]) !== null && _$Encounter$appointme10 !== void 0 ? _$Encounter$appointme10 : "",
                 enId: _.Encounter.id,
-                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter69 = _.Encounter) === null || _$Encounter69 === void 0 ? void 0 : (_$Encounter69$patient = _$Encounter69.patient_id) === null || _$Encounter69$patient === void 0 ? void 0 : (_$Encounter69$patient2 = _$Encounter69$patient[0]) === null || _$Encounter69$patient2 === void 0 ? void 0 : (_$Encounter69$patient3 = _$Encounter69$patient2.telecom) === null || _$Encounter69$patient3 === void 0 ? void 0 : (_$Encounter69$patient4 = _$Encounter69$patient3[0]) === null || _$Encounter69$patient4 === void 0 ? void 0 : _$Encounter69$patient4.value,
-                personId: (_$Appointment$PersonI19 = _ === null || _ === void 0 ? void 0 : (_$Appointment53 = _.Appointment) === null || _$Appointment53 === void 0 ? void 0 : (_$Appointment53$Perso = _$Appointment53.PersonID) === null || _$Appointment53$Perso === void 0 ? void 0 : (_$Appointment53$Perso2 = _$Appointment53$Perso[0]) === null || _$Appointment53$Perso2 === void 0 ? void 0 : _$Appointment53$Perso2.Id) !== null && _$Appointment$PersonI19 !== void 0 ? _$Appointment$PersonI19 : null,
-                patientId: (_$Encounter$patient_i18 = _ === null || _ === void 0 ? void 0 : (_$Encounter70 = _.Encounter) === null || _$Encounter70 === void 0 ? void 0 : (_$Encounter70$patient = _$Encounter70.patient_id) === null || _$Encounter70$patient === void 0 ? void 0 : (_$Encounter70$patient2 = _$Encounter70$patient[0]) === null || _$Encounter70$patient2 === void 0 ? void 0 : _$Encounter70$patient2.id) !== null && _$Encounter$patient_i18 !== void 0 ? _$Encounter$patient_i18 : null
-              })
+                contact: _ === null || _ === void 0 ? void 0 : (_$Encounter39 = _.Encounter) === null || _$Encounter39 === void 0 ? void 0 : (_$Encounter39$patient = _$Encounter39.patient_id) === null || _$Encounter39$patient === void 0 ? void 0 : (_$Encounter39$patient2 = _$Encounter39$patient[0]) === null || _$Encounter39$patient2 === void 0 ? void 0 : (_$Encounter39$patient3 = _$Encounter39$patient2.telecom) === null || _$Encounter39$patient3 === void 0 ? void 0 : (_$Encounter39$patient4 = _$Encounter39$patient3[0]) === null || _$Encounter39$patient4 === void 0 ? void 0 : _$Encounter39$patient4.value,
+                personId: (_$Appointment$PersonI8 = _ === 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$Perso2.Id) !== null && _$Appointment$PersonI8 !== void 0 ? _$Appointment$PersonI8 : null,
+                patientId: (_$Encounter$patient_i8 = _ === 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$patient2.id) !== null && _$Encounter$patient_i8 !== void 0 ? _$Encounter$patient_i8 : null
+              }) // modifyaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+              // cancelaction: JSON.stringify({
+              //   appNo: _?.Encounter?.appointmentId?.[0] ?? "",
+              //   enId: _.Encounter.id,
+              //   contact: _?.Encounter?.patient_id?.[0]?.telecom?.[0]?.value,
+              //   personId: _?.Appointment?.PersonID?.[0]?.Id ?? null,
+              //   patientId: _?.Encounter?.patient_id?.[0]?.id ?? null,
+              // }),
+
             };
           }) : [];
           return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38876,46 +39022,44 @@ 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 _$Appointment54, _$Appointment54$Perso, _$Appointment54$Perso2, _$Appointment54$Perso3, _$Appointment54$Perso4, _$Appointment55, _$Appointment55$Perso, _$Appointment55$Perso2, _$Appointment55$Perso3, _$Appointment55$Perso4, _$Appointment56, _$Appointment56$Perso, _$Appointment56$Perso2, _$Appointment56$Perso3, _$Appointment57, _$Appointment57$Perso, _$Appointment57$Perso2, _$Appointment58, _$Appointment58$Perso, _$Appointment58$Perso2, _$Appointment58$Perso3, _$Appointment$PersonI20, _$Appointment59, _$Appointment59$Perso, _$Appointment59$Perso2, _$Appointment59$Perso3, _$Appointment59$Perso4, _$Appointment60, _$Appointment61, _$Appointment62, _$Appointment63, _$Appointment64, _$Appointment$appoint2, _$Appointment65, _$Appointment$Special, _$Appointment66, _$Appointment66$Speci, _$Appointment$orgid$n, _$Appointment67, _$Appointment67$orgid, _$practitioner_detail, _$practitioner_detail2, _$Appointment68;
+            var _$Appointment43, _$Appointment43$Perso, _$Appointment43$Perso2, _$Appointment43$Perso3, _$Appointment44, _$Appointment44$Perso, _$Appointment44$Perso2, _$Appointment45, _$Appointment45$Perso, _$Appointment45$Perso2, _$Appointment45$Perso3, _$Appointment46, _$Appointment46$Perso, _$Appointment46$Perso2, _$Appointment46$Perso3, _$Appointment46$Perso4, _$Appointment47, _$Appointment47$Perso, _$Appointment47$Perso2, _$Appointment47$Perso3, _$Appointment47$Perso4, _$Appointment$appoint2, _$Appointment48, _$Appointment49, _$Appointment50, _$Appointment51, _$Appointment52, _$Appointment53, _$Appointment54;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment54 = _.Appointment) === null || _$Appointment54 === void 0 ? void 0 : (_$Appointment54$Perso = _$Appointment54.PersonID) === null || _$Appointment54$Perso === void 0 ? void 0 : (_$Appointment54$Perso2 = _$Appointment54$Perso[0]) === null || _$Appointment54$Perso2 === void 0 ? void 0 : (_$Appointment54$Perso3 = _$Appointment54$Perso2.photo) === null || _$Appointment54$Perso3 === void 0 ? void 0 : (_$Appointment54$Perso4 = _$Appointment54$Perso3[0]) === null || _$Appointment54$Perso4 === void 0 ? void 0 : _$Appointment54$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment55 = _.Appointment) === null || _$Appointment55 === void 0 ? void 0 : (_$Appointment55$Perso = _$Appointment55.PersonID) === null || _$Appointment55$Perso === void 0 ? void 0 : (_$Appointment55$Perso2 = _$Appointment55$Perso[0]) === null || _$Appointment55$Perso2 === void 0 ? void 0 : (_$Appointment55$Perso3 = _$Appointment55$Perso2.photo) === null || _$Appointment55$Perso3 === void 0 ? void 0 : (_$Appointment55$Perso4 = _$Appointment55$Perso3[0]) === null || _$Appointment55$Perso4 === void 0 ? void 0 : _$Appointment55$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: JSON.stringify({
-                name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment56 = _.Appointment) === null || _$Appointment56 === void 0 ? void 0 : (_$Appointment56$Perso = _$Appointment56.PersonID) === null || _$Appointment56$Perso === void 0 ? void 0 : (_$Appointment56$Perso2 = _$Appointment56$Perso[0]) === null || _$Appointment56$Perso2 === void 0 ? void 0 : (_$Appointment56$Perso3 = _$Appointment56$Perso2.name) === null || _$Appointment56$Perso3 === void 0 ? void 0 : _$Appointment56$Perso3[0]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment57 = _.Appointment) === null || _$Appointment57 === void 0 ? void 0 : (_$Appointment57$Perso = _$Appointment57.PersonID) === null || _$Appointment57$Perso === void 0 ? void 0 : (_$Appointment57$Perso2 = _$Appointment57$Perso[0]) === null || _$Appointment57$Perso2 === void 0 ? void 0 : _$Appointment57$Perso2.birthDay),
-                mrn: (_$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$Perso3 = _$Appointment58$Perso2.MRN) === null || _$Appointment58$Perso3 === void 0 ? void 0 : _$Appointment58$Perso3[0],
-                // genderData: "M",
-                contact: (_$Appointment$PersonI20 = (_$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$Perso3 = _$Appointment59$Perso2.telecom) === null || _$Appointment59$Perso3 === void 0 ? void 0 : (_$Appointment59$Perso4 = _$Appointment59$Perso3[0]) === null || _$Appointment59$Perso4 === void 0 ? void 0 : _$Appointment59$Perso4.value) !== null && _$Appointment$PersonI20 !== void 0 ? _$Appointment$PersonI20 : ""
-              }),
+              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : (_$Appointment43$Perso = _$Appointment43.PersonID) === null || _$Appointment43$Perso === void 0 ? void 0 : (_$Appointment43$Perso2 = _$Appointment43$Perso[0]) === null || _$Appointment43$Perso2 === void 0 ? void 0 : (_$Appointment43$Perso3 = _$Appointment43$Perso2.name) === null || _$Appointment43$Perso3 === void 0 ? void 0 : _$Appointment43$Perso3[0]) || {}),
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : (_$Appointment44$Perso = _$Appointment44.PersonID) === null || _$Appointment44$Perso === void 0 ? void 0 : (_$Appointment44$Perso2 = _$Appointment44$Perso[0]) === null || _$Appointment44$Perso2 === void 0 ? void 0 : _$Appointment44$Perso2.birthDay),
+              mrn: (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : (_$Appointment45$Perso = _$Appointment45.PersonID) === null || _$Appointment45$Perso === void 0 ? void 0 : (_$Appointment45$Perso2 = _$Appointment45$Perso[0]) === null || _$Appointment45$Perso2 === void 0 ? void 0 : (_$Appointment45$Perso3 = _$Appointment45$Perso2.MRN) === null || _$Appointment45$Perso3 === void 0 ? void 0 : _$Appointment45$Perso3[0],
+              // genderData: "M",
+              contact: ((_$Appointment46 = _.Appointment) === null || _$Appointment46 === void 0 ? void 0 : (_$Appointment46$Perso = _$Appointment46.PersonID) === null || _$Appointment46$Perso === void 0 ? void 0 : (_$Appointment46$Perso2 = _$Appointment46$Perso[0]) === null || _$Appointment46$Perso2 === void 0 ? void 0 : (_$Appointment46$Perso3 = _$Appointment46$Perso2.telecom) === null || _$Appointment46$Perso3 === void 0 ? void 0 : (_$Appointment46$Perso4 = _$Appointment46$Perso3[0]) === null || _$Appointment46$Perso4 === void 0 ? void 0 : _$Appointment46$Perso4.value) ? JSON.stringify((_$Appointment47 = _.Appointment) === null || _$Appointment47 === void 0 ? void 0 : (_$Appointment47$Perso = _$Appointment47.PersonID) === null || _$Appointment47$Perso === void 0 ? void 0 : (_$Appointment47$Perso2 = _$Appointment47$Perso[0]) === null || _$Appointment47$Perso2 === void 0 ? void 0 : (_$Appointment47$Perso3 = _$Appointment47$Perso2.telecom) === null || _$Appointment47$Perso3 === void 0 ? void 0 : (_$Appointment47$Perso4 = _$Appointment47$Perso3[0]) === null || _$Appointment47$Perso4 === void 0 ? void 0 : _$Appointment47$Perso4.value) : "",
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment60 = _.Appointment) === null || _$Appointment60 === void 0 ? void 0 : _$Appointment60.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$Appointment61 = _.Appointment) === null || _$Appointment61 === void 0 ? void 0 : _$Appointment61.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment62 = _.Appointment) === null || _$Appointment62 === void 0 ? void 0 : _$Appointment62.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$Appointment63 = _.Appointment) === null || _$Appointment63 === void 0 ? void 0 : _$Appointment63.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment64 = _.Appointment) === null || _$Appointment64 === void 0 ? void 0 : _$Appointment64.start, "hh:mm A") : ""
-              }),
-              visitType: (_$Appointment$appoint2 = _ === null || _ === void 0 ? void 0 : (_$Appointment65 = _.Appointment) === null || _$Appointment65 === void 0 ? void 0 : _$Appointment65.appointmentType) !== null && _$Appointment$appoint2 !== void 0 ? _$Appointment$appoint2 : "",
-              speciality: JSON.stringify({
-                speciality: (_$Appointment$Special = _ === null || _ === void 0 ? void 0 : (_$Appointment66 = _.Appointment) === null || _$Appointment66 === void 0 ? void 0 : (_$Appointment66$Speci = _$Appointment66.SpecialtyID) === null || _$Appointment66$Speci === void 0 ? void 0 : _$Appointment66$Speci.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(", ")) !== null && _$Appointment$Special !== void 0 ? _$Appointment$Special : "",
-                clinic: (_$Appointment$orgid$n = _ === null || _ === void 0 ? void 0 : (_$Appointment67 = _.Appointment) === null || _$Appointment67 === void 0 ? void 0 : (_$Appointment67$orgid = _$Appointment67.orgid) === null || _$Appointment67$orgid === void 0 ? void 0 : _$Appointment67$orgid.name) !== null && _$Appointment$orgid$n !== void 0 ? _$Appointment$orgid$n : ""
-              }),
-              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 : (_$Appointment68 = _.Appointment) === null || _$Appointment68 === void 0 ? void 0 : _$Appointment68.appstatus) || "",
-              "View Patient": true,
-              Attend: true,
-              action: true,
-              type: "OP" // appNo: _?.id ?? '',
+              visitType: (_$Appointment$appoint2 = _ === null || _ === void 0 ? void 0 : (_$Appointment48 = _.Appointment) === null || _$Appointment48 === void 0 ? void 0 : _$Appointment48.appointmentType) !== null && _$Appointment$appoint2 !== void 0 ? _$Appointment$appoint2 : "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment49 = _.Appointment) === null || _$Appointment49 === void 0 ? void 0 : _$Appointment49.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment50 = _.Appointment) === null || _$Appointment50 === void 0 ? void 0 : _$Appointment50.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment51 = _.Appointment) === null || _$Appointment51 === void 0 ? void 0 : _$Appointment51.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment52 = _.Appointment) === null || _$Appointment52 === void 0 ? void 0 : _$Appointment52.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment53 = _.Appointment) === null || _$Appointment53 === void 0 ? void 0 : _$Appointment53.appno) || "",
+              // speciality: JSON.stringify({
+              //   speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", ") ?? "",
+              //   clinic: _?.Appointment?.orgid?.name ?? ""
+              // }),
+              // clinic: _?.practitioner_details?.[0]?.clinic || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment54 = _.Appointment) === null || _$Appointment54 === void 0 ? void 0 : _$Appointment54.appstatus) || "",
+              // "View Patient": true,
+              // Attend: true,
+              // action: true,
+              // type: "OP",
+              // appNo: _?.id ?? '',
               // // data: _,
               // enId: _.id,
               // age: getAge(_?.PersonID?.[0]?.birthDay),
               // // gender: _?.PersonID?.[0]?.gender,
               // contact: _?.PersonID?.[0]?.telecom?.[0]?.value ?? "",
               // pId : _?.patient_id?.id,
-
+              action: true
             };
           }) : [];
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38960,10 +39104,14 @@ 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 _$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, _$appointmentId3, _$appointmentId3$, _$appointmentId3$$Per, _$appointmentId3$$Per2, _$patient_id2, _$patient_id2$, _$appointmentId$0$Per, _$appointmentId4, _$appointmentId4$, _$appointmentId4$$Per, _$appointmentId4$$Per2, _$patient_id$0$teleco, _$patient_id3, _$patient_id3$, _$patient_id3$$teleco, _$patient_id3$$teleco2, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$appointmentId7, _$appointmentId7$, _$appointmentId8, _$appointmentId8$, _$appointmentId9, _$appointmentId9$, _$visit_type, _$appointmentId10, _$appointmentId10$, _$appointmentId10$$Sp, _$practitioner_detail3, _$practitioner_detail4, _$status;
+            var _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$visit_type, _$appointmentId2, _$appointmentId2$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$status;
 
             return {
-              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",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
@@ -38990,29 +39138,30 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
               // // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id ?? "",
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : (_$appointmentId3$$Per = _$appointmentId3$.PersonID) === null || _$appointmentId3$$Per === void 0 ? void 0 : (_$appointmentId3$$Per2 = _$appointmentId3$$Per[0]) === null || _$appointmentId3$$Per2 === void 0 ? void 0 : _$appointmentId3$$Per2.birthDay),
-                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) || "",
-                genderData: (_$appointmentId$0$Per = _ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : (_$appointmentId4$$Per = _$appointmentId4$.PersonID) === null || _$appointmentId4$$Per === void 0 ? void 0 : (_$appointmentId4$$Per2 = _$appointmentId4$$Per[0]) === null || _$appointmentId4$$Per2 === void 0 ? void 0 : _$appointmentId4$$Per2.gender) !== null && _$appointmentId$0$Per !== void 0 ? _$appointmentId$0$Per : "",
-                contact: (_$patient_id$0$teleco = _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : (_$patient_id3$$teleco = _$patient_id3$.telecom) === null || _$patient_id3$$teleco === void 0 ? void 0 : (_$patient_id3$$teleco2 = _$patient_id3$$teleco[0]) === null || _$patient_id3$$teleco2 === void 0 ? void 0 : _$patient_id3$$teleco2.value) !== null && _$patient_id$0$teleco !== void 0 ? _$patient_id$0$teleco : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : _$appointmentId7$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : _$appointmentId8$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.start, "hh:mm A") : ""
-              }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.alias) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$ = _$appointmentId[0]) === null || _$appointmentId$ === void 0 ? void 0 : (_$appointmentId$$Pers = _$appointmentId$.PersonID) === null || _$appointmentId$$Pers === void 0 ? void 0 : (_$appointmentId$$Pers2 = _$appointmentId$$Pers[0]) === null || _$appointmentId$$Pers2 === void 0 ? void 0 : _$appointmentId$$Pers2.birthDay),
               visitType: (_$visit_type = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type !== void 0 ? _$visit_type : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : (_$appointmentId10$$Sp = _$appointmentId10$.SpecialtyID) === null || _$appointmentId10$$Sp === void 0 ? void 0 : _$appointmentId10$$Sp.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 : (_$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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : _$appointmentId2$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.appno) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display) || "",
-              action: true
+              action: true // genderData: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
+
             };
           }) : [];
           return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39057,10 +39206,12 @@ 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 _$appointmentId11, _$appointmentId11$, _$appointmentId11$$Pe, _$appointmentId11$$Pe2, _$appointmentId11$$Pe3, _$appointmentId11$$Pe4, _$appointmentId12, _$appointmentId12$, _$appointmentId12$$Pe, _$appointmentId12$$Pe2, _$appointmentId12$$Pe3, _$appointmentId12$$Pe4, _$patient_id4, _$patient_id4$, _$patient_id4$$name, _$appointmentId13, _$appointmentId13$, _$appointmentId13$$Pe, _$appointmentId13$$Pe2, _$patient_id5, _$patient_id5$, _$appointmentId$0$Per2, _$appointmentId14, _$appointmentId14$, _$appointmentId14$$Pe, _$appointmentId14$$Pe2, _$patient_id$0$teleco2, _$patient_id6, _$patient_id6$, _$patient_id6$$teleco, _$patient_id6$$teleco2, _$appointmentId15, _$appointmentId15$, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$appointmentId19, _$appointmentId19$, _$visit_type2, _$appointmentId20, _$appointmentId20$, _$appointmentId20$$Sp, _$practitioner_detail5, _$practitioner_detail6, _$status2;
+            var _$patient_id3, _$patient_id3$, _$patient_id3$$name, _$patient_id4, _$patient_id4$, _$appointmentId7, _$appointmentId7$, _$appointmentId7$$Per, _$appointmentId7$$Per2, _$visit_type2, _$appointmentId8, _$appointmentId8$, _$appointmentId9, _$appointmentId9$, _$appointmentId10, _$appointmentId10$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$status2;
 
             return {
-              img: (_ === 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$$Pe3 = _$appointmentId11$$Pe2.photo) === null || _$appointmentId11$$Pe3 === void 0 ? void 0 : (_$appointmentId11$$Pe4 = _$appointmentId11$$Pe3[0]) === null || _$appointmentId11$$Pe4 === void 0 ? void 0 : _$appointmentId11$$Pe4.fileid) ? getImgUrl(_ === 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) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
@@ -39087,27 +39238,33 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : (_$appointmentId13$$Pe = _$appointmentId13$.PersonID) === null || _$appointmentId13$$Pe === void 0 ? void 0 : (_$appointmentId13$$Pe2 = _$appointmentId13$$Pe[0]) === null || _$appointmentId13$$Pe2 === void 0 ? void 0 : _$appointmentId13$$Pe2.birthDay),
-                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) || "",
-                gender: (_$appointmentId$0$Per2 = _ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : (_$appointmentId14$$Pe = _$appointmentId14$.PersonID) === null || _$appointmentId14$$Pe === void 0 ? void 0 : (_$appointmentId14$$Pe2 = _$appointmentId14$$Pe[0]) === null || _$appointmentId14$$Pe2 === void 0 ? void 0 : _$appointmentId14$$Pe2.gender) !== null && _$appointmentId$0$Per2 !== void 0 ? _$appointmentId$0$Per2 : "",
-                contact: (_$patient_id$0$teleco2 = _ === null || _ === void 0 ? void 0 : (_$patient_id6 = _.patient_id) === null || _$patient_id6 === void 0 ? void 0 : (_$patient_id6$ = _$patient_id6[0]) === null || _$patient_id6$ === void 0 ? void 0 : (_$patient_id6$$teleco = _$patient_id6$.telecom) === null || _$patient_id6$$teleco === void 0 ? void 0 : (_$patient_id6$$teleco2 = _$patient_id6$$teleco[0]) === null || _$patient_id6$$teleco2 === void 0 ? void 0 : _$patient_id6$$teleco2.value) !== null && _$patient_id$0$teleco2 !== void 0 ? _$patient_id$0$teleco2 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : _$appointmentId19$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.alias || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : (_$patient_id3$$name = _$patient_id3$.name) === null || _$patient_id3$$name === void 0 ? void 0 : _$patient_id3$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id4 = _.patient_id) === null || _$patient_id4 === void 0 ? void 0 : (_$patient_id4$ = _$patient_id4[0]) === null || _$patient_id4$ === void 0 ? void 0 : _$patient_id4$.alias) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : (_$appointmentId7$$Per = _$appointmentId7$.PersonID) === null || _$appointmentId7$$Per === void 0 ? void 0 : (_$appointmentId7$$Per2 = _$appointmentId7$$Per[0]) === null || _$appointmentId7$$Per2 === void 0 ? void 0 : _$appointmentId7$$Per2.birthDay),
               visitType: (_$visit_type2 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type2 !== void 0 ? _$visit_type2 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : (_$appointmentId20$$Sp = _$appointmentId20$.SpecialtyID) === null || _$appointmentId20$$Sp === void 0 ? void 0 : _$appointmentId20$$Sp.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 : (_$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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : _$appointmentId8$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : _$appointmentId10$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : _$appointmentId12$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status2 = _.status) === null || _$status2 === void 0 ? void 0 : _$status2.display) || "",
               action: true
             };
@@ -39154,10 +39311,14 @@ 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 _$appointmentId21, _$appointmentId21$, _$appointmentId21$$Pe, _$appointmentId21$$Pe2, _$appointmentId21$$Pe3, _$appointmentId21$$Pe4, _$appointmentId22, _$appointmentId22$, _$appointmentId22$$Pe, _$appointmentId22$$Pe2, _$appointmentId22$$Pe3, _$appointmentId22$$Pe4, _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$appointmentId23, _$appointmentId23$, _$appointmentId23$$Pe, _$appointmentId23$$Pe2, _$patient_id8, _$patient_id8$, _$appointmentId$0$Per3, _$appointmentId24, _$appointmentId24$, _$appointmentId24$$Pe, _$appointmentId24$$Pe2, _$patient_id$0$teleco3, _$patient_id9, _$patient_id9$, _$patient_id9$$teleco, _$patient_id9$$teleco2, _$appointmentId25, _$appointmentId25$, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$visit_type3, _$appointmentId30, _$appointmentId30$, _$appointmentId30$$Sp, _$practitioner_detail7, _$practitioner_detail8, _$status3;
+            var _$patient_id5, _$patient_id5$, _$patient_id5$$name, _$patient_id6, _$patient_id6$, _$appointmentId13, _$appointmentId13$, _$appointmentId13$$Pe, _$appointmentId13$$Pe2, _$visit_type3, _$appointmentId14, _$appointmentId14$, _$appointmentId15, _$appointmentId15$, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$status3;
 
             return {
-              img: (_ === 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$$Pe3 = _$appointmentId21$$Pe2.photo) === null || _$appointmentId21$$Pe3 === void 0 ? void 0 : (_$appointmentId21$$Pe4 = _$appointmentId21$$Pe3[0]) === null || _$appointmentId21$$Pe4 === void 0 ? void 0 : _$appointmentId21$$Pe4.fileid) ? getImgUrl(_ === 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$$Pe3 = _$appointmentId22$$Pe2.photo) === null || _$appointmentId22$$Pe3 === void 0 ? void 0 : (_$appointmentId22$$Pe4 = _$appointmentId22$$Pe3[0]) === null || _$appointmentId22$$Pe4 === void 0 ? void 0 : _$appointmentId22$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
@@ -39184,27 +39345,33 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === 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$$Pe2.birthDay),
-                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) || "",
-                gender: (_$appointmentId$0$Per3 = _ === 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$$Pe2.gender) !== null && _$appointmentId$0$Per3 !== void 0 ? _$appointmentId$0$Per3 : "",
-                contact: (_$patient_id$0$teleco3 = _ === null || _ === void 0 ? void 0 : (_$patient_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : (_$patient_id9$$teleco = _$patient_id9$.telecom) === null || _$patient_id9$$teleco === void 0 ? void 0 : (_$patient_id9$$teleco2 = _$patient_id9$$teleco[0]) === null || _$patient_id9$$teleco2 === void 0 ? void 0 : _$patient_id9$$teleco2.value) !== null && _$patient_id$0$teleco3 !== void 0 ? _$patient_id$0$teleco3 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : _$appointmentId25$.appno) || "",
-              date: JSON.stringify({
-                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") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.alias || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : (_$patient_id5$ = _$patient_id5[0]) === null || _$patient_id5$ === void 0 ? void 0 : (_$patient_id5$$name = _$patient_id5$.name) === null || _$patient_id5$$name === void 0 ? void 0 : _$patient_id5$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id6 = _.patient_id) === null || _$patient_id6 === void 0 ? void 0 : (_$patient_id6$ = _$patient_id6[0]) === null || _$patient_id6$ === void 0 ? void 0 : _$patient_id6$.alias) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : (_$appointmentId13$$Pe = _$appointmentId13$.PersonID) === null || _$appointmentId13$$Pe === void 0 ? void 0 : (_$appointmentId13$$Pe2 = _$appointmentId13$$Pe[0]) === null || _$appointmentId13$$Pe2 === void 0 ? void 0 : _$appointmentId13$$Pe2.birthDay),
               visitType: (_$visit_type3 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type3 !== void 0 ? _$visit_type3 : "",
-              speciality: JSON.stringify({
-                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$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 : (_$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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : _$appointmentId14$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status3 = _.status) === null || _$status3 === void 0 ? void 0 : _$status3.display) || "",
               action: true
             };
@@ -39251,10 +39418,12 @@ 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 _$appointmentId31, _$appointmentId31$, _$appointmentId31$$Pe, _$appointmentId31$$Pe2, _$appointmentId31$$Pe3, _$appointmentId32, _$appointmentId32$, _$appointmentId32$$Pe, _$appointmentId32$$Pe2, _$appointmentId32$$Pe3, _$patient_id10, _$patient_id10$, _$patient_id10$$name, _$appointmentId33, _$appointmentId33$, _$appointmentId33$$Pe, _$appointmentId33$$Pe2, _$patient_id11, _$patient_id11$, _$appointmentId$0$Per4, _$appointmentId34, _$appointmentId34$, _$appointmentId34$$Pe, _$appointmentId34$$Pe2, _$patient_id$0$teleco4, _$patient_id12, _$patient_id12$, _$patient_id12$$telec, _$patient_id12$$telec2, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$visit_type4, _$appointmentId40, _$appointmentId40$, _$appointmentId40$$Sp, _$practitioner_detail9, _$practitioner_detail10, _$status4;
+            var _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$appointmentId19, _$appointmentId19$, _$appointmentId19$$Pe, _$appointmentId19$$Pe2, _$visit_type4, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId22, _$appointmentId22$, _$appointmentId23, _$appointmentId23$, _$appointmentId24, _$appointmentId24$, _$status4;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : (_$appointmentId31$$Pe = _$appointmentId31$.PersonID) === null || _$appointmentId31$$Pe === void 0 ? void 0 : (_$appointmentId31$$Pe2 = _$appointmentId31$$Pe[0]) === null || _$appointmentId31$$Pe2 === void 0 ? void 0 : (_$appointmentId31$$Pe3 = _$appointmentId31$$Pe2.photo[0]) === null || _$appointmentId31$$Pe3 === void 0 ? void 0 : _$appointmentId31$$Pe3.fileid) ? getImgUrl(_ === 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$$Pe3 = _$appointmentId32$$Pe2.photo[0]) === null || _$appointmentId32$$Pe3 === void 0 ? void 0 : _$appointmentId32$$Pe3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN,
               // age: _?.patient_id?.[0]?.age,
@@ -39280,28 +39449,28 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === 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.birthDay),
-                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) || "",
-                gender: (_$appointmentId$0$Per4 = _ === 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$$Pe2.gender) !== null && _$appointmentId$0$Per4 !== void 0 ? _$appointmentId$0$Per4 : "",
-                contact: (_$patient_id$0$teleco4 = _ === null || _ === void 0 ? void 0 : (_$patient_id12 = _.patient_id) === null || _$patient_id12 === void 0 ? void 0 : (_$patient_id12$ = _$patient_id12[0]) === null || _$patient_id12$ === void 0 ? void 0 : (_$patient_id12$$telec = _$patient_id12$.telecom) === null || _$patient_id12$$telec === void 0 ? void 0 : (_$patient_id12$$telec2 = _$patient_id12$$telec[0]) === null || _$patient_id12$$telec2 === void 0 ? void 0 : _$patient_id12$$telec2.value) !== null && _$patient_id$0$teleco4 !== void 0 ? _$patient_id$0$teleco4 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : _$appointmentId35$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : _$appointmentId37$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : _$appointmentId39$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.alias || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id8 = _.patient_id) === null || _$patient_id8 === void 0 ? void 0 : (_$patient_id8$ = _$patient_id8[0]) === null || _$patient_id8$ === void 0 ? void 0 : _$patient_id8$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : (_$appointmentId19$$Pe = _$appointmentId19$.PersonID) === null || _$appointmentId19$$Pe === void 0 ? void 0 : (_$appointmentId19$$Pe2 = _$appointmentId19$$Pe[0]) === null || _$appointmentId19$$Pe2 === void 0 ? void 0 : _$appointmentId19$$Pe2.birthDay),
               visitType: (_$visit_type4 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type4 !== void 0 ? _$visit_type4 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : (_$appointmentId40$$Sp = _$appointmentId40$.SpecialtyID) === null || _$appointmentId40$$Sp === void 0 ? void 0 : _$appointmentId40$$Sp.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 : (_$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) || ""
-              }),
+              // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ? JSON.stringify(_?.patient_id?.[0]?.telecom?.[0]?.value) : "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : _$appointmentId21$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId22 = _.appointmentId) === null || _$appointmentId22 === void 0 ? void 0 : (_$appointmentId22$ = _$appointmentId22[0]) === null || _$appointmentId22$ === void 0 ? void 0 : _$appointmentId22$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : _$appointmentId23$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : _$appointmentId24$.appno) || "",
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display) || "",
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               action: true
             };
           }) : [];
@@ -39347,10 +39516,14 @@ 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 _$appointmentId41, _$appointmentId41$, _$appointmentId41$$Pe, _$appointmentId41$$Pe2, _$appointmentId41$$Pe3, _$appointmentId41$$Pe4, _$appointmentId42, _$appointmentId42$, _$appointmentId42$$Pe, _$appointmentId42$$Pe2, _$appointmentId42$$Pe3, _$appointmentId42$$Pe4, _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$appointmentId43, _$appointmentId43$, _$appointmentId43$$Pe, _$appointmentId43$$Pe2, _$patient_id14, _$patient_id14$, _$appointmentId$0$Per5, _$appointmentId44, _$appointmentId44$, _$appointmentId44$$Pe, _$appointmentId44$$Pe2, _$patient_id$0$teleco5, _$patient_id15, _$patient_id15$, _$patient_id15$$telec, _$patient_id15$$telec2, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$appointmentId47, _$appointmentId47$, _$appointmentId48, _$appointmentId48$, _$appointmentId49, _$appointmentId49$, _$visit_type5, _$appointmentId50, _$appointmentId50$, _$appointmentId50$$Sp, _$practitioner_detail11, _$practitioner_detail12, _$status5;
+            var _$patient_id9, _$patient_id9$, _$patient_id9$$name, _$patient_id10, _$patient_id10$, _$appointmentId25, _$appointmentId25$, _$appointmentId25$$Pe, _$appointmentId25$$Pe2, _$visit_type5, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId30, _$appointmentId30$, _$status5;
 
             return {
-              img: (_ === 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) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : (_$appointmentId42$$Pe = _$appointmentId42$.PersonID) === null || _$appointmentId42$$Pe === void 0 ? void 0 : (_$appointmentId42$$Pe2 = _$appointmentId42$$Pe[0]) === null || _$appointmentId42$$Pe2 === void 0 ? void 0 : (_$appointmentId42$$Pe3 = _$appointmentId42$$Pe2.photo) === null || _$appointmentId42$$Pe3 === void 0 ? void 0 : (_$appointmentId42$$Pe4 = _$appointmentId42$$Pe3[0]) === null || _$appointmentId42$$Pe4 === void 0 ? void 0 : _$appointmentId42$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
@@ -39377,27 +39550,33 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                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),
-                mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : _$patient_id14$.alias) || "",
-                gender: (_$appointmentId$0$Per5 = _ === 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) !== null && _$appointmentId$0$Per5 !== void 0 ? _$appointmentId$0$Per5 : "",
-                contact: (_$patient_id$0$teleco5 = _ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : (_$patient_id15$$telec = _$patient_id15$.telecom) === null || _$patient_id15$$telec === void 0 ? void 0 : (_$patient_id15$$telec2 = _$patient_id15$$telec[0]) === null || _$patient_id15$$telec2 === void 0 ? void 0 : _$patient_id15$$telec2.value) !== null && _$patient_id$0$teleco5 !== void 0 ? _$patient_id$0$teleco5 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : _$appointmentId47$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : _$appointmentId48$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : _$appointmentId49$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.alias || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : (_$patient_id9$$name = _$patient_id9$.name) === null || _$patient_id9$$name === void 0 ? void 0 : _$patient_id9$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : (_$patient_id10$ = _$patient_id10[0]) === null || _$patient_id10$ === void 0 ? void 0 : _$patient_id10$.alias) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : (_$appointmentId25$$Pe = _$appointmentId25$.PersonID) === null || _$appointmentId25$$Pe === void 0 ? void 0 : (_$appointmentId25$$Pe2 = _$appointmentId25$$Pe[0]) === null || _$appointmentId25$$Pe2 === void 0 ? void 0 : _$appointmentId25$$Pe2.birthDay),
               visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : (_$appointmentId50$$Sp = _$appointmentId50$.SpecialtyID) === null || _$appointmentId50$$Sp === void 0 ? void 0 : _$appointmentId50$$Sp.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 : (_$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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : _$appointmentId29$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : _$appointmentId30$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status5 = _.status) === null || _$status5 === void 0 ? void 0 : _$status5.display) || "",
               action: true
             };
@@ -39445,39 +39624,50 @@ 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 _$Appointment69, _$Appointment69$Perso, _$Appointment69$Perso2, _$Appointment69$Perso3, _$Appointment69$Perso4, _$Appointment70, _$Appointment70$Perso, _$Appointment70$Perso2, _$Appointment70$Perso3, _$Appointment70$Perso4, _$Appointment71, _$Appointment71$Perso, _$Appointment71$Perso2, _$Appointment71$Perso3, _$Appointment72, _$Appointment72$Perso, _$Appointment72$Perso2, _$Appointment73, _$Appointment73$Perso, _$Appointment73$Perso2, _$Appointment73$Perso3, _$Appointment$PersonI21, _$Appointment74, _$Appointment74$Perso, _$Appointment74$Perso2, _$Appointment74$Perso3, _$Appointment74$Perso4, _$Appointment75, _$Appointment76, _$Appointment77, _$Appointment78, _$Appointment79, _$Appointment$appoint3, _$Appointment80, _$Appointment$Special2, _$Appointment81, _$Appointment81$Speci, _$Appointment$orgid$n2, _$Appointment82, _$Appointment82$orgid, _$practitioner_detail13, _$practitioner_detail14, _$Appointment83;
+            var _$Appointment55, _$Appointment55$Perso, _$Appointment55$Perso2, _$Appointment55$Perso3, _$Appointment56, _$Appointment56$Perso, _$Appointment56$Perso2, _$Appointment56$Perso3, _$Appointment57, _$Appointment57$Perso, _$Appointment57$Perso2, _$Appointment$appoint3, _$Appointment58, _$Appointment59, _$Appointment60, _$Appointment61, _$Appointment62, _$Appointment63, _$Appointment64;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment69 = _.Appointment) === null || _$Appointment69 === void 0 ? void 0 : (_$Appointment69$Perso = _$Appointment69.PersonID) === null || _$Appointment69$Perso === void 0 ? void 0 : (_$Appointment69$Perso2 = _$Appointment69$Perso[0]) === null || _$Appointment69$Perso2 === void 0 ? void 0 : (_$Appointment69$Perso3 = _$Appointment69$Perso2.photo) === null || _$Appointment69$Perso3 === void 0 ? void 0 : (_$Appointment69$Perso4 = _$Appointment69$Perso3[0]) === null || _$Appointment69$Perso4 === void 0 ? void 0 : _$Appointment69$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment70 = _.Appointment) === null || _$Appointment70 === void 0 ? void 0 : (_$Appointment70$Perso = _$Appointment70.PersonID) === null || _$Appointment70$Perso === void 0 ? void 0 : (_$Appointment70$Perso2 = _$Appointment70$Perso[0]) === null || _$Appointment70$Perso2 === void 0 ? void 0 : (_$Appointment70$Perso3 = _$Appointment70$Perso2.photo) === null || _$Appointment70$Perso3 === void 0 ? void 0 : (_$Appointment70$Perso4 = _$Appointment70$Perso3[0]) === null || _$Appointment70$Perso4 === void 0 ? void 0 : _$Appointment70$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: JSON.stringify({
-                name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment71 = _.Appointment) === null || _$Appointment71 === void 0 ? void 0 : (_$Appointment71$Perso = _$Appointment71.PersonID) === null || _$Appointment71$Perso === void 0 ? void 0 : (_$Appointment71$Perso2 = _$Appointment71$Perso[0]) === null || _$Appointment71$Perso2 === void 0 ? void 0 : (_$Appointment71$Perso3 = _$Appointment71$Perso2.name) === null || _$Appointment71$Perso3 === void 0 ? void 0 : _$Appointment71$Perso3[0]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment72 = _.Appointment) === null || _$Appointment72 === void 0 ? void 0 : (_$Appointment72$Perso = _$Appointment72.PersonID) === null || _$Appointment72$Perso === void 0 ? void 0 : (_$Appointment72$Perso2 = _$Appointment72$Perso[0]) === null || _$Appointment72$Perso2 === void 0 ? void 0 : _$Appointment72$Perso2.birthDay),
-                mrn: (_$Appointment73 = _.Appointment) === null || _$Appointment73 === void 0 ? void 0 : (_$Appointment73$Perso = _$Appointment73.PersonID) === null || _$Appointment73$Perso === void 0 ? void 0 : (_$Appointment73$Perso2 = _$Appointment73$Perso[0]) === null || _$Appointment73$Perso2 === void 0 ? void 0 : (_$Appointment73$Perso3 = _$Appointment73$Perso2.MRN) === null || _$Appointment73$Perso3 === void 0 ? void 0 : _$Appointment73$Perso3[0],
-                // genderData: "M",
-                contact: (_$Appointment$PersonI21 = (_$Appointment74 = _.Appointment) === null || _$Appointment74 === void 0 ? void 0 : (_$Appointment74$Perso = _$Appointment74.PersonID) === null || _$Appointment74$Perso === void 0 ? void 0 : (_$Appointment74$Perso2 = _$Appointment74$Perso[0]) === null || _$Appointment74$Perso2 === void 0 ? void 0 : (_$Appointment74$Perso3 = _$Appointment74$Perso2.telecom) === null || _$Appointment74$Perso3 === void 0 ? void 0 : (_$Appointment74$Perso4 = _$Appointment74$Perso3[0]) === null || _$Appointment74$Perso4 === void 0 ? void 0 : _$Appointment74$Perso4.value) !== null && _$Appointment$PersonI21 !== void 0 ? _$Appointment$PersonI21 : ""
-              }),
+              // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // name: JSON.stringify({
+              //   name: makeName(_?.Appointment?.PersonID?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.Appointment?.PersonID?.[0]?.birthDay),
+              //   mrn: _.Appointment?.PersonID?.[0]?.MRN?.[0],
+              //   // genderData: "M",
+              //   contact: _.Appointment?.PersonID?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Appointment55 = _.Appointment) === null || _$Appointment55 === void 0 ? void 0 : (_$Appointment55$Perso = _$Appointment55.PersonID) === null || _$Appointment55$Perso === void 0 ? void 0 : (_$Appointment55$Perso2 = _$Appointment55$Perso[0]) === null || _$Appointment55$Perso2 === void 0 ? void 0 : (_$Appointment55$Perso3 = _$Appointment55$Perso2.name) === null || _$Appointment55$Perso3 === void 0 ? void 0 : _$Appointment55$Perso3[0]) || {}),
+              mrn: ((_$Appointment56 = _.Appointment) === null || _$Appointment56 === void 0 ? void 0 : (_$Appointment56$Perso = _$Appointment56.PersonID) === null || _$Appointment56$Perso === void 0 ? void 0 : (_$Appointment56$Perso2 = _$Appointment56$Perso[0]) === null || _$Appointment56$Perso2 === void 0 ? void 0 : (_$Appointment56$Perso3 = _$Appointment56$Perso2.MRN) === null || _$Appointment56$Perso3 === void 0 ? void 0 : _$Appointment56$Perso3[0]) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment57 = _.Appointment) === null || _$Appointment57 === void 0 ? void 0 : (_$Appointment57$Perso = _$Appointment57.PersonID) === null || _$Appointment57$Perso === void 0 ? void 0 : (_$Appointment57$Perso2 = _$Appointment57$Perso[0]) === null || _$Appointment57$Perso2 === void 0 ? void 0 : _$Appointment57$Perso2.birthDay),
+              visitType: (_$Appointment$appoint3 = _ === null || _ === void 0 ? void 0 : (_$Appointment58 = _.Appointment) === null || _$Appointment58 === void 0 ? void 0 : _$Appointment58.appointmentType) !== null && _$Appointment$appoint3 !== void 0 ? _$Appointment$appoint3 : "",
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment59 = _.Appointment) === null || _$Appointment59 === void 0 ? void 0 : _$Appointment59.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment60 = _.Appointment) === null || _$Appointment60 === void 0 ? void 0 : _$Appointment60.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment61 = _.Appointment) === null || _$Appointment61 === void 0 ? void 0 : _$Appointment61.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment62 = _.Appointment) === null || _$Appointment62 === void 0 ? void 0 : _$Appointment62.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment63 = _.Appointment) === null || _$Appointment63 === void 0 ? void 0 : _$Appointment63.appno) || "",
               // mrn: _?.patient_id?.[0]?.alias || "",
               // age: _?.patient_id?.[0]?.age,
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$Appointment75 = _.Appointment) === null || _$Appointment75 === void 0 ? void 0 : _$Appointment75.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$Appointment76 = _.Appointment) === null || _$Appointment76 === void 0 ? void 0 : _$Appointment76.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment77 = _.Appointment) === null || _$Appointment77 === void 0 ? void 0 : _$Appointment77.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$Appointment78 = _.Appointment) === null || _$Appointment78 === void 0 ? void 0 : _$Appointment78.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment79 = _.Appointment) === null || _$Appointment79 === void 0 ? void 0 : _$Appointment79.start, "hh:mm A") : ""
-              }),
-              visitType: (_$Appointment$appoint3 = _ === null || _ === void 0 ? void 0 : (_$Appointment80 = _.Appointment) === null || _$Appointment80 === void 0 ? void 0 : _$Appointment80.appointmentType) !== null && _$Appointment$appoint3 !== void 0 ? _$Appointment$appoint3 : "",
-              speciality: JSON.stringify({
-                speciality: (_$Appointment$Special2 = _ === null || _ === void 0 ? void 0 : (_$Appointment81 = _.Appointment) === null || _$Appointment81 === void 0 ? void 0 : (_$Appointment81$Speci = _$Appointment81.SpecialtyID) === null || _$Appointment81$Speci === void 0 ? void 0 : _$Appointment81$Speci.map(function (spl) {
-                  var _spl$coding7, _spl$coding7$;
-
-                  return spl === null || spl === void 0 ? void 0 : (_spl$coding7 = spl.coding) === null || _spl$coding7 === void 0 ? void 0 : (_spl$coding7$ = _spl$coding7[0]) === null || _spl$coding7$ === void 0 ? void 0 : _spl$coding7$.display;
-                }).join(", ")) !== null && _$Appointment$Special2 !== void 0 ? _$Appointment$Special2 : "",
-                clinic: (_$Appointment$orgid$n2 = _ === null || _ === void 0 ? void 0 : (_$Appointment82 = _.Appointment) === null || _$Appointment82 === void 0 ? void 0 : (_$Appointment82$orgid = _$Appointment82.orgid) === null || _$Appointment82$orgid === void 0 ? void 0 : _$Appointment82$orgid.name) !== null && _$Appointment$orgid$n2 !== void 0 ? _$Appointment$orgid$n2 : ""
-              }),
-              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 : (_$Appointment83 = _.Appointment) === null || _$Appointment83 === void 0 ? void 0 : _$Appointment83.appstatus) || "",
-              "View Patient": true,
-              Attend: true,
-              action: true,
-              type: "OP" // appNo: _?.id ?? '',
+              // date: JSON.stringify({
+              //   date: _?.Appointment?.start
+              //     ? utcTOLocal(_?.Appointment?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.Appointment?.start
+              //     ? utcTOLocal(_?.Appointment?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // visitType: _?.Appointment?.appointmentType ?? "",
+              // speciality: JSON.stringify({
+              //   speciality: _?.Appointment?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", ") ?? "",
+              //   clinic: _?.Appointment?.orgid?.name ?? ""
+              // }),
+              // clinic: _?.practitioner_details?.[0]?.clinic || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$Appointment64 = _.Appointment) === null || _$Appointment64 === void 0 ? void 0 : _$Appointment64.appstatus) || "",
+              // "View Patient": true,
+              // Attend: true,
+              action: true // type: "OP",
+              // appNo: _?.id ?? '',
               // // data: _,
               // enId: _.id,
               // age: getAge(_?.PersonID?.[0]?.birthDay),
@@ -39529,10 +39719,14 @@ 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 _$appointmentId51, _$appointmentId51$, _$appointmentId51$$Pe, _$appointmentId51$$Pe2, _$appointmentId51$$Pe3, _$appointmentId51$$Pe4, _$appointmentId52, _$appointmentId52$, _$appointmentId52$$Pe, _$appointmentId52$$Pe2, _$appointmentId52$$Pe3, _$appointmentId52$$Pe4, _$patient_id16, _$patient_id16$, _$patient_id16$$name, _$appointmentId53, _$appointmentId53$, _$appointmentId53$$Pe, _$appointmentId53$$Pe2, _$patient_id17, _$patient_id17$, _$appointmentId$0$Per6, _$appointmentId54, _$appointmentId54$, _$appointmentId54$$Pe, _$appointmentId54$$Pe2, _$patient_id$0$teleco6, _$patient_id18, _$patient_id18$, _$patient_id18$$telec, _$patient_id18$$telec2, _$appointmentId55, _$appointmentId55$, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$visit_type6, _$appointmentId60, _$appointmentId60$, _$appointmentId60$$Sp, _$practitioner_detail15, _$practitioner_detail16, _$status6;
+            var _$patient_id11, _$patient_id11$, _$patient_id11$$name, _$patient_id12, _$patient_id12$, _$appointmentId31, _$appointmentId31$, _$appointmentId31$$Pe, _$appointmentId31$$Pe2, _$visit_type6, _$appointmentId32, _$appointmentId32$, _$appointmentId33, _$appointmentId33$, _$appointmentId34, _$appointmentId34$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$status6;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : (_$appointmentId51$$Pe = _$appointmentId51$.PersonID) === null || _$appointmentId51$$Pe === void 0 ? void 0 : (_$appointmentId51$$Pe2 = _$appointmentId51$$Pe[0]) === null || _$appointmentId51$$Pe2 === void 0 ? void 0 : (_$appointmentId51$$Pe3 = _$appointmentId51$$Pe2.photo) === null || _$appointmentId51$$Pe3 === void 0 ? void 0 : (_$appointmentId51$$Pe4 = _$appointmentId51$$Pe3[0]) === null || _$appointmentId51$$Pe4 === void 0 ? void 0 : _$appointmentId51$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : (_$appointmentId52$$Pe = _$appointmentId52$.PersonID) === null || _$appointmentId52$$Pe === void 0 ? void 0 : (_$appointmentId52$$Pe2 = _$appointmentId52$$Pe[0]) === null || _$appointmentId52$$Pe2 === void 0 ? void 0 : (_$appointmentId52$$Pe3 = _$appointmentId52$$Pe2.photo) === null || _$appointmentId52$$Pe3 === void 0 ? void 0 : (_$appointmentId52$$Pe4 = _$appointmentId52$$Pe3[0]) === null || _$appointmentId52$$Pe4 === void 0 ? void 0 : _$appointmentId52$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN || "",
               // refNo: _?.appointmentId?.[0]?.appno || "",
@@ -39558,27 +39752,33 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                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),
-                mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : _$patient_id17$.MRN) || "",
-                gender: (_$appointmentId$0$Per6 = _ === 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) !== null && _$appointmentId$0$Per6 !== void 0 ? _$appointmentId$0$Per6 : "",
-                contact: (_$patient_id$0$teleco6 = _ === null || _ === void 0 ? void 0 : (_$patient_id18 = _.patient_id) === null || _$patient_id18 === void 0 ? void 0 : (_$patient_id18$ = _$patient_id18[0]) === null || _$patient_id18$ === void 0 ? void 0 : (_$patient_id18$$telec = _$patient_id18$.telecom) === null || _$patient_id18$$telec === void 0 ? void 0 : (_$patient_id18$$telec2 = _$patient_id18$$telec[0]) === null || _$patient_id18$$telec2 === void 0 ? void 0 : _$patient_id18$$telec2.value) !== null && _$patient_id$0$teleco6 !== void 0 ? _$patient_id$0$teleco6 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : _$appointmentId55$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.MRN || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id11 = _.patient_id) === null || _$patient_id11 === void 0 ? void 0 : (_$patient_id11$ = _$patient_id11[0]) === null || _$patient_id11$ === void 0 ? void 0 : (_$patient_id11$$name = _$patient_id11$.name) === null || _$patient_id11$$name === void 0 ? void 0 : _$patient_id11$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id12 = _.patient_id) === null || _$patient_id12 === void 0 ? void 0 : (_$patient_id12$ = _$patient_id12[0]) === null || _$patient_id12$ === void 0 ? void 0 : _$patient_id12$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : (_$appointmentId31$$Pe = _$appointmentId31$.PersonID) === null || _$appointmentId31$$Pe === void 0 ? void 0 : (_$appointmentId31$$Pe2 = _$appointmentId31$$Pe[0]) === null || _$appointmentId31$$Pe2 === void 0 ? void 0 : _$appointmentId31$$Pe2.birthDay),
               visitType: (_$visit_type6 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type6 !== void 0 ? _$visit_type6 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : (_$appointmentId60$$Sp = _$appointmentId60$.SpecialtyID) === null || _$appointmentId60$$Sp === void 0 ? void 0 : _$appointmentId60$$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;
-                }).join(", "),
-                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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : _$appointmentId32$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : _$appointmentId33$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : _$appointmentId35$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status6 = _.status) === null || _$status6 === void 0 ? void 0 : _$status6.display) || "",
               action: true
             };
@@ -39625,10 +39825,14 @@ 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 _$appointmentId61, _$appointmentId61$, _$appointmentId61$$Pe, _$appointmentId61$$Pe2, _$appointmentId61$$Pe3, _$appointmentId61$$Pe4, _$appointmentId62, _$appointmentId62$, _$appointmentId62$$Pe, _$appointmentId62$$Pe2, _$appointmentId62$$Pe3, _$appointmentId62$$Pe4, _$patient_id19, _$patient_id19$, _$patient_id19$$name, _$appointmentId63, _$appointmentId63$, _$appointmentId63$$Pe, _$appointmentId63$$Pe2, _$patient_id20, _$patient_id20$, _$appointmentId$0$Per7, _$appointmentId64, _$appointmentId64$, _$appointmentId64$$Pe, _$appointmentId64$$Pe2, _$patient_id$0$teleco7, _$patient_id21, _$patient_id21$, _$patient_id21$$telec, _$patient_id21$$telec2, _$appointmentId65, _$appointmentId65$, _$appointmentId66, _$appointmentId66$, _$appointmentId67, _$appointmentId67$, _$appointmentId68, _$appointmentId68$, _$appointmentId69, _$appointmentId69$, _$visit_type7, _$appointmentId70, _$appointmentId70$, _$appointmentId70$$Sp, _$practitioner_detail17, _$practitioner_detail18, _$status7;
+            var _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$appointmentId37, _$appointmentId37$, _$appointmentId37$$Pe, _$appointmentId37$$Pe2, _$visit_type7, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId40, _$appointmentId40$, _$appointmentId41, _$appointmentId41$, _$appointmentId42, _$appointmentId42$, _$status7;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : (_$appointmentId61$$Pe = _$appointmentId61$.PersonID) === null || _$appointmentId61$$Pe === void 0 ? void 0 : (_$appointmentId61$$Pe2 = _$appointmentId61$$Pe[0]) === null || _$appointmentId61$$Pe2 === void 0 ? void 0 : (_$appointmentId61$$Pe3 = _$appointmentId61$$Pe2.photo) === null || _$appointmentId61$$Pe3 === void 0 ? void 0 : (_$appointmentId61$$Pe4 = _$appointmentId61$$Pe3[0]) === null || _$appointmentId61$$Pe4 === void 0 ? void 0 : _$appointmentId61$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : (_$appointmentId62$$Pe = _$appointmentId62$.PersonID) === null || _$appointmentId62$$Pe === void 0 ? void 0 : (_$appointmentId62$$Pe2 = _$appointmentId62$$Pe[0]) === null || _$appointmentId62$$Pe2 === void 0 ? void 0 : (_$appointmentId62$$Pe3 = _$appointmentId62$$Pe2.photo) === null || _$appointmentId62$$Pe3 === void 0 ? void 0 : (_$appointmentId62$$Pe4 = _$appointmentId62$$Pe3[0]) === null || _$appointmentId62$$Pe4 === void 0 ? void 0 : _$appointmentId62$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN || "",
               // refNo: _?.appointmentId?.[0]?.appno || "",
@@ -39654,27 +39858,33 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id19 = _.patient_id) === null || _$patient_id19 === void 0 ? void 0 : (_$patient_id19$ = _$patient_id19[0]) === null || _$patient_id19$ === void 0 ? void 0 : (_$patient_id19$$name = _$patient_id19$.name) === null || _$patient_id19$$name === void 0 ? void 0 : _$patient_id19$$name[0]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : (_$appointmentId63$$Pe = _$appointmentId63$.PersonID) === null || _$appointmentId63$$Pe === void 0 ? void 0 : (_$appointmentId63$$Pe2 = _$appointmentId63$$Pe[0]) === null || _$appointmentId63$$Pe2 === void 0 ? void 0 : _$appointmentId63$$Pe2.birthDay),
-                mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id20 = _.patient_id) === null || _$patient_id20 === void 0 ? void 0 : (_$patient_id20$ = _$patient_id20[0]) === null || _$patient_id20$ === void 0 ? void 0 : _$patient_id20$.MRN) || "",
-                gender: (_$appointmentId$0$Per7 = _ === 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.gender) !== null && _$appointmentId$0$Per7 !== void 0 ? _$appointmentId$0$Per7 : "",
-                contact: (_$patient_id$0$teleco7 = _ === null || _ === void 0 ? void 0 : (_$patient_id21 = _.patient_id) === null || _$patient_id21 === void 0 ? void 0 : (_$patient_id21$ = _$patient_id21[0]) === null || _$patient_id21$ === void 0 ? void 0 : (_$patient_id21$$telec = _$patient_id21$.telecom) === null || _$patient_id21$$telec === void 0 ? void 0 : (_$patient_id21$$telec2 = _$patient_id21$$telec[0]) === null || _$patient_id21$$telec2 === void 0 ? void 0 : _$patient_id21$$telec2.value) !== null && _$patient_id$0$teleco7 !== void 0 ? _$patient_id$0$teleco7 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : _$appointmentId65$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : _$appointmentId66$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId67 = _.appointmentId) === null || _$appointmentId67 === void 0 ? void 0 : (_$appointmentId67$ = _$appointmentId67[0]) === null || _$appointmentId67$ === void 0 ? void 0 : _$appointmentId67$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId68 = _.appointmentId) === null || _$appointmentId68 === void 0 ? void 0 : (_$appointmentId68$ = _$appointmentId68[0]) === null || _$appointmentId68$ === void 0 ? void 0 : _$appointmentId68$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId69 = _.appointmentId) === null || _$appointmentId69 === void 0 ? void 0 : (_$appointmentId69$ = _$appointmentId69[0]) === null || _$appointmentId69$ === void 0 ? void 0 : _$appointmentId69$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.MRN || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : _$patient_id14$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : (_$appointmentId37$$Pe = _$appointmentId37$.PersonID) === null || _$appointmentId37$$Pe === void 0 ? void 0 : (_$appointmentId37$$Pe2 = _$appointmentId37$$Pe[0]) === null || _$appointmentId37$$Pe2 === void 0 ? void 0 : _$appointmentId37$$Pe2.birthDay),
               visitType: (_$visit_type7 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type7 !== void 0 ? _$visit_type7 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId70 = _.appointmentId) === null || _$appointmentId70 === void 0 ? void 0 : (_$appointmentId70$ = _$appointmentId70[0]) === null || _$appointmentId70$ === void 0 ? void 0 : (_$appointmentId70$$Sp = _$appointmentId70$.SpecialtyID) === null || _$appointmentId70$$Sp === void 0 ? void 0 : _$appointmentId70$$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;
-                }).join(", "),
-                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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : _$appointmentId39$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : _$appointmentId41$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status7 = _.status) === null || _$status7 === void 0 ? void 0 : _$status7.display) || "",
               action: true
             };
@@ -39721,10 +39931,14 @@ 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 _$appointmentId71, _$appointmentId71$, _$appointmentId71$$Pe, _$appointmentId71$$Pe2, _$appointmentId71$$Pe3, _$appointmentId71$$Pe4, _$appointmentId72, _$appointmentId72$, _$appointmentId72$$Pe, _$appointmentId72$$Pe2, _$appointmentId72$$Pe3, _$appointmentId72$$Pe4, _$patient_id22, _$patient_id22$, _$patient_id22$$name, _$appointmentId73, _$appointmentId73$, _$appointmentId73$$Pe, _$appointmentId73$$Pe2, _$patient_id23, _$patient_id23$, _$appointmentId$0$Per8, _$appointmentId74, _$appointmentId74$, _$appointmentId74$$Pe, _$appointmentId74$$Pe2, _$patient_id$0$teleco8, _$patient_id24, _$patient_id24$, _$patient_id24$$telec, _$patient_id24$$telec2, _$appointmentId75, _$appointmentId75$, _$appointmentId76, _$appointmentId76$, _$appointmentId77, _$appointmentId77$, _$appointmentId78, _$appointmentId78$, _$appointmentId79, _$appointmentId79$, _$visit_type8, _$appointmentId80, _$appointmentId80$, _$appointmentId80$$Sp, _$practitioner_detail19, _$practitioner_detail20, _$status8;
+            var _$patient_id15, _$patient_id15$, _$patient_id15$$name, _$patient_id16, _$patient_id16$, _$appointmentId43, _$appointmentId43$, _$appointmentId43$$Pe, _$appointmentId43$$Pe2, _$visit_type8, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$appointmentId47, _$appointmentId47$, _$appointmentId48, _$appointmentId48$, _$status8;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId71 = _.appointmentId) === null || _$appointmentId71 === void 0 ? void 0 : (_$appointmentId71$ = _$appointmentId71[0]) === null || _$appointmentId71$ === void 0 ? void 0 : (_$appointmentId71$$Pe = _$appointmentId71$.PersonID) === null || _$appointmentId71$$Pe === void 0 ? void 0 : (_$appointmentId71$$Pe2 = _$appointmentId71$$Pe[0]) === null || _$appointmentId71$$Pe2 === void 0 ? void 0 : (_$appointmentId71$$Pe3 = _$appointmentId71$$Pe2.photo) === null || _$appointmentId71$$Pe3 === void 0 ? void 0 : (_$appointmentId71$$Pe4 = _$appointmentId71$$Pe3[0]) === null || _$appointmentId71$$Pe4 === void 0 ? void 0 : _$appointmentId71$$Pe4.fileid) ? getImgUrl(_ === 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) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN || "",
               // refNo: _?.appointmentId?.[0]?.appno || "",
@@ -39750,27 +39964,33 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === 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$$Pe2.birthDay),
-                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) || "",
-                gender: (_$appointmentId$0$Per8 = _ === null || _ === void 0 ? void 0 : (_$appointmentId74 = _.appointmentId) === null || _$appointmentId74 === void 0 ? void 0 : (_$appointmentId74$ = _$appointmentId74[0]) === null || _$appointmentId74$ === void 0 ? void 0 : (_$appointmentId74$$Pe = _$appointmentId74$.PersonID) === null || _$appointmentId74$$Pe === void 0 ? void 0 : (_$appointmentId74$$Pe2 = _$appointmentId74$$Pe[0]) === null || _$appointmentId74$$Pe2 === void 0 ? void 0 : _$appointmentId74$$Pe2.gender) !== null && _$appointmentId$0$Per8 !== void 0 ? _$appointmentId$0$Per8 : "",
-                contact: (_$patient_id$0$teleco8 = _ === null || _ === void 0 ? void 0 : (_$patient_id24 = _.patient_id) === null || _$patient_id24 === void 0 ? void 0 : (_$patient_id24$ = _$patient_id24[0]) === null || _$patient_id24$ === void 0 ? void 0 : (_$patient_id24$$telec = _$patient_id24$.telecom) === null || _$patient_id24$$telec === void 0 ? void 0 : (_$patient_id24$$telec2 = _$patient_id24$$telec[0]) === null || _$patient_id24$$telec2 === void 0 ? void 0 : _$patient_id24$$telec2.value) !== null && _$patient_id$0$teleco8 !== void 0 ? _$patient_id$0$teleco8 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId75 = _.appointmentId) === null || _$appointmentId75 === void 0 ? void 0 : (_$appointmentId75$ = _$appointmentId75[0]) === null || _$appointmentId75$ === void 0 ? void 0 : _$appointmentId75$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId76 = _.appointmentId) === null || _$appointmentId76 === void 0 ? void 0 : (_$appointmentId76$ = _$appointmentId76[0]) === null || _$appointmentId76$ === void 0 ? void 0 : _$appointmentId76$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId77 = _.appointmentId) === null || _$appointmentId77 === void 0 ? void 0 : (_$appointmentId77$ = _$appointmentId77[0]) === null || _$appointmentId77$ === void 0 ? void 0 : _$appointmentId77$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId78 = _.appointmentId) === null || _$appointmentId78 === void 0 ? void 0 : (_$appointmentId78$ = _$appointmentId78[0]) === null || _$appointmentId78$ === void 0 ? void 0 : _$appointmentId78$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId79 = _.appointmentId) === null || _$appointmentId79 === void 0 ? void 0 : (_$appointmentId79$ = _$appointmentId79[0]) === null || _$appointmentId79$ === void 0 ? void 0 : _$appointmentId79$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.MRN || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : (_$patient_id15$$name = _$patient_id15$.name) === null || _$patient_id15$$name === void 0 ? void 0 : _$patient_id15$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id16 = _.patient_id) === null || _$patient_id16 === void 0 ? void 0 : (_$patient_id16$ = _$patient_id16[0]) === null || _$patient_id16$ === void 0 ? void 0 : _$patient_id16$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId43 = _.appointmentId) === null || _$appointmentId43 === void 0 ? void 0 : (_$appointmentId43$ = _$appointmentId43[0]) === null || _$appointmentId43$ === void 0 ? void 0 : (_$appointmentId43$$Pe = _$appointmentId43$.PersonID) === null || _$appointmentId43$$Pe === void 0 ? void 0 : (_$appointmentId43$$Pe2 = _$appointmentId43$$Pe[0]) === null || _$appointmentId43$$Pe2 === void 0 ? void 0 : _$appointmentId43$$Pe2.birthDay),
               visitType: (_$visit_type8 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type8 !== void 0 ? _$visit_type8 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId80 = _.appointmentId) === null || _$appointmentId80 === void 0 ? void 0 : (_$appointmentId80$ = _$appointmentId80[0]) === null || _$appointmentId80$ === void 0 ? void 0 : (_$appointmentId80$$Sp = _$appointmentId80$.SpecialtyID) === null || _$appointmentId80$$Sp === void 0 ? void 0 : _$appointmentId80$$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;
-                }).join(", "),
-                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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : _$appointmentId47$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : _$appointmentId48$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status8 = _.status) === null || _$status8 === void 0 ? void 0 : _$status8.display) || "",
               action: true
             };
@@ -39817,10 +40037,14 @@ 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 _$appointmentId81, _$appointmentId81$, _$appointmentId81$$Pe, _$appointmentId81$$Pe2, _$appointmentId81$$Pe3, _$appointmentId81$$Pe4, _$appointmentId82, _$appointmentId82$, _$appointmentId82$$Pe, _$appointmentId82$$Pe2, _$appointmentId82$$Pe3, _$appointmentId82$$Pe4, _$patient_id25, _$patient_id25$, _$patient_id25$$name, _$appointmentId83, _$appointmentId83$, _$appointmentId83$$Pe, _$appointmentId83$$Pe2, _$patient_id26, _$patient_id26$, _$appointmentId$0$Per9, _$appointmentId84, _$appointmentId84$, _$appointmentId84$$Pe, _$appointmentId84$$Pe2, _$patient_id$0$teleco9, _$patient_id27, _$patient_id27$, _$patient_id27$$telec, _$patient_id27$$telec2, _$appointmentId85, _$appointmentId85$, _$appointmentId86, _$appointmentId86$, _$appointmentId87, _$appointmentId87$, _$appointmentId88, _$appointmentId88$, _$appointmentId89, _$appointmentId89$, _$visit_type9, _$appointmentId90, _$appointmentId90$, _$appointmentId90$$Sp, _$practitioner_detail21, _$practitioner_detail22, _$status9;
+            var _$patient_id17, _$patient_id17$, _$patient_id17$$name, _$patient_id18, _$patient_id18$, _$appointmentId49, _$appointmentId49$, _$appointmentId49$$Pe, _$appointmentId49$$Pe2, _$visit_type9, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId54, _$appointmentId54$, _$status9;
 
             return {
-              img: (_ === 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) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId82 = _.appointmentId) === null || _$appointmentId82 === void 0 ? void 0 : (_$appointmentId82$ = _$appointmentId82[0]) === null || _$appointmentId82$ === void 0 ? void 0 : (_$appointmentId82$$Pe = _$appointmentId82$.PersonID) === null || _$appointmentId82$$Pe === void 0 ? void 0 : (_$appointmentId82$$Pe2 = _$appointmentId82$$Pe[0]) === null || _$appointmentId82$$Pe2 === void 0 ? void 0 : (_$appointmentId82$$Pe3 = _$appointmentId82$$Pe2.photo) === null || _$appointmentId82$$Pe3 === void 0 ? void 0 : (_$appointmentId82$$Pe4 = _$appointmentId82$$Pe3[0]) === null || _$appointmentId82$$Pe4 === void 0 ? void 0 : _$appointmentId82$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN || "",
               // refNo: _?.appointmentId?.[0]?.appno || "",
@@ -39846,27 +40070,33 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : (_$patient_id25$$name = _$patient_id25$.name) === null || _$patient_id25$$name === void 0 ? void 0 : _$patient_id25$$name[0]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId83 = _.appointmentId) === null || _$appointmentId83 === void 0 ? void 0 : (_$appointmentId83$ = _$appointmentId83[0]) === null || _$appointmentId83$ === void 0 ? void 0 : (_$appointmentId83$$Pe = _$appointmentId83$.PersonID) === null || _$appointmentId83$$Pe === void 0 ? void 0 : (_$appointmentId83$$Pe2 = _$appointmentId83$$Pe[0]) === null || _$appointmentId83$$Pe2 === void 0 ? void 0 : _$appointmentId83$$Pe2.birthDay),
-                mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : _$patient_id26$.MRN) || "",
-                gender: (_$appointmentId$0$Per9 = _ === null || _ === void 0 ? void 0 : (_$appointmentId84 = _.appointmentId) === null || _$appointmentId84 === void 0 ? void 0 : (_$appointmentId84$ = _$appointmentId84[0]) === null || _$appointmentId84$ === void 0 ? void 0 : (_$appointmentId84$$Pe = _$appointmentId84$.PersonID) === null || _$appointmentId84$$Pe === void 0 ? void 0 : (_$appointmentId84$$Pe2 = _$appointmentId84$$Pe[0]) === null || _$appointmentId84$$Pe2 === void 0 ? void 0 : _$appointmentId84$$Pe2.gender) !== null && _$appointmentId$0$Per9 !== void 0 ? _$appointmentId$0$Per9 : "",
-                contact: (_$patient_id$0$teleco9 = _ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : (_$patient_id27$$telec = _$patient_id27$.telecom) === null || _$patient_id27$$telec === void 0 ? void 0 : (_$patient_id27$$telec2 = _$patient_id27$$telec[0]) === null || _$patient_id27$$telec2 === void 0 ? void 0 : _$patient_id27$$telec2.value) !== null && _$patient_id$0$teleco9 !== void 0 ? _$patient_id$0$teleco9 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId85 = _.appointmentId) === null || _$appointmentId85 === void 0 ? void 0 : (_$appointmentId85$ = _$appointmentId85[0]) === null || _$appointmentId85$ === void 0 ? void 0 : _$appointmentId85$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId86 = _.appointmentId) === null || _$appointmentId86 === void 0 ? void 0 : (_$appointmentId86$ = _$appointmentId86[0]) === null || _$appointmentId86$ === void 0 ? void 0 : _$appointmentId86$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId87 = _.appointmentId) === null || _$appointmentId87 === void 0 ? void 0 : (_$appointmentId87$ = _$appointmentId87[0]) === null || _$appointmentId87$ === void 0 ? void 0 : _$appointmentId87$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId88 = _.appointmentId) === null || _$appointmentId88 === void 0 ? void 0 : (_$appointmentId88$ = _$appointmentId88[0]) === null || _$appointmentId88$ === void 0 ? void 0 : _$appointmentId88$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId89 = _.appointmentId) === null || _$appointmentId89 === void 0 ? void 0 : (_$appointmentId89$ = _$appointmentId89[0]) === null || _$appointmentId89$ === void 0 ? void 0 : _$appointmentId89$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.MRN || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : (_$patient_id17$$name = _$patient_id17$.name) === null || _$patient_id17$$name === void 0 ? void 0 : _$patient_id17$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id18 = _.patient_id) === null || _$patient_id18 === void 0 ? void 0 : (_$patient_id18$ = _$patient_id18[0]) === null || _$patient_id18$ === void 0 ? void 0 : _$patient_id18$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : (_$appointmentId49$$Pe = _$appointmentId49$.PersonID) === null || _$appointmentId49$$Pe === void 0 ? void 0 : (_$appointmentId49$$Pe2 = _$appointmentId49$$Pe[0]) === null || _$appointmentId49$$Pe2 === void 0 ? void 0 : _$appointmentId49$$Pe2.birthDay),
               visitType: (_$visit_type9 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type9 !== void 0 ? _$visit_type9 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId90 = _.appointmentId) === null || _$appointmentId90 === void 0 ? void 0 : (_$appointmentId90$ = _$appointmentId90[0]) === null || _$appointmentId90$ === void 0 ? void 0 : (_$appointmentId90$$Sp = _$appointmentId90$.SpecialtyID) === null || _$appointmentId90$$Sp === void 0 ? void 0 : _$appointmentId90$$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(", "),
-                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) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : _$appointmentId51$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : _$appointmentId53$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId54 = _.appointmentId) === null || _$appointmentId54 === void 0 ? void 0 : (_$appointmentId54$ = _$appointmentId54[0]) === null || _$appointmentId54$ === void 0 ? void 0 : _$appointmentId54$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status9 = _.status) === null || _$status9 === void 0 ? void 0 : _$status9.display) || "",
               action: true
             };
@@ -39913,10 +40143,14 @@ 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 _$appointmentId91, _$appointmentId91$, _$appointmentId91$$Pe, _$appointmentId91$$Pe2, _$appointmentId91$$Pe3, _$appointmentId91$$Pe4, _$appointmentId92, _$appointmentId92$, _$appointmentId92$$Pe, _$appointmentId92$$Pe2, _$appointmentId92$$Pe3, _$appointmentId92$$Pe4, _$patient_id28, _$patient_id28$, _$patient_id28$$name, _$appointmentId93, _$appointmentId93$, _$appointmentId93$$Pe, _$appointmentId93$$Pe2, _$patient_id29, _$patient_id29$, _$appointmentId$0$Per10, _$appointmentId94, _$appointmentId94$, _$appointmentId94$$Pe, _$appointmentId94$$Pe2, _$patient_id$0$teleco10, _$patient_id30, _$patient_id30$, _$patient_id30$$telec, _$patient_id30$$telec2, _$appointmentId95, _$appointmentId95$, _$appointmentId96, _$appointmentId96$, _$appointmentId97, _$appointmentId97$, _$appointmentId98, _$appointmentId98$, _$appointmentId99, _$appointmentId99$, _$visit_type10, _$appointmentId100, _$appointmentId100$, _$appointmentId100$$S, _$practitioner_detail23, _$practitioner_detail24, _$status10;
+            var _$patient_id19, _$patient_id19$, _$patient_id19$$name, _$patient_id20, _$patient_id20$, _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Pe, _$appointmentId55$$Pe2, _$visit_type10, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$status10;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId91 = _.appointmentId) === null || _$appointmentId91 === void 0 ? void 0 : (_$appointmentId91$ = _$appointmentId91[0]) === null || _$appointmentId91$ === void 0 ? void 0 : (_$appointmentId91$$Pe = _$appointmentId91$.PersonID) === null || _$appointmentId91$$Pe === void 0 ? void 0 : (_$appointmentId91$$Pe2 = _$appointmentId91$$Pe[0]) === null || _$appointmentId91$$Pe2 === void 0 ? void 0 : (_$appointmentId91$$Pe3 = _$appointmentId91$$Pe2.photo) === null || _$appointmentId91$$Pe3 === void 0 ? void 0 : (_$appointmentId91$$Pe4 = _$appointmentId91$$Pe3[0]) === null || _$appointmentId91$$Pe4 === void 0 ? void 0 : _$appointmentId91$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId92 = _.appointmentId) === null || _$appointmentId92 === void 0 ? void 0 : (_$appointmentId92$ = _$appointmentId92[0]) === null || _$appointmentId92$ === void 0 ? void 0 : (_$appointmentId92$$Pe = _$appointmentId92$.PersonID) === null || _$appointmentId92$$Pe === void 0 ? void 0 : (_$appointmentId92$$Pe2 = _$appointmentId92$$Pe[0]) === null || _$appointmentId92$$Pe2 === void 0 ? void 0 : (_$appointmentId92$$Pe3 = _$appointmentId92$$Pe2.photo) === null || _$appointmentId92$$Pe3 === void 0 ? void 0 : (_$appointmentId92$$Pe4 = _$appointmentId92$$Pe3[0]) === null || _$appointmentId92$$Pe4 === void 0 ? void 0 : _$appointmentId92$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   ? getImgUrl(
+              //     _?.appointmentId?.[0]?.PersonID?.[0]?.photo?.[0]?.fileid
+              //   )
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               // name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
               // mrn: _?.patient_id?.[0]?.MRN || "",
               // refNo: _?.appointmentId?.[0]?.appno || "",
@@ -39942,27 +40176,33 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
               // gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender,
               // contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? "",
               // pId: _?.patient_id?.id,
-              name: JSON.stringify({
-                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]) || {}),
-                age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId93 = _.appointmentId) === null || _$appointmentId93 === void 0 ? void 0 : (_$appointmentId93$ = _$appointmentId93[0]) === null || _$appointmentId93$ === void 0 ? void 0 : (_$appointmentId93$$Pe = _$appointmentId93$.PersonID) === null || _$appointmentId93$$Pe === void 0 ? void 0 : (_$appointmentId93$$Pe2 = _$appointmentId93$$Pe[0]) === null || _$appointmentId93$$Pe2 === void 0 ? void 0 : _$appointmentId93$$Pe2.birthDay),
-                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) || "",
-                gender: (_$appointmentId$0$Per10 = _ === null || _ === void 0 ? void 0 : (_$appointmentId94 = _.appointmentId) === null || _$appointmentId94 === void 0 ? void 0 : (_$appointmentId94$ = _$appointmentId94[0]) === null || _$appointmentId94$ === void 0 ? void 0 : (_$appointmentId94$$Pe = _$appointmentId94$.PersonID) === null || _$appointmentId94$$Pe === void 0 ? void 0 : (_$appointmentId94$$Pe2 = _$appointmentId94$$Pe[0]) === null || _$appointmentId94$$Pe2 === void 0 ? void 0 : _$appointmentId94$$Pe2.gender) !== null && _$appointmentId$0$Per10 !== void 0 ? _$appointmentId$0$Per10 : "",
-                contact: (_$patient_id$0$teleco10 = _ === null || _ === void 0 ? void 0 : (_$patient_id30 = _.patient_id) === null || _$patient_id30 === void 0 ? void 0 : (_$patient_id30$ = _$patient_id30[0]) === null || _$patient_id30$ === void 0 ? void 0 : (_$patient_id30$$telec = _$patient_id30$.telecom) === null || _$patient_id30$$telec === void 0 ? void 0 : (_$patient_id30$$telec2 = _$patient_id30$$telec[0]) === null || _$patient_id30$$telec2 === void 0 ? void 0 : _$patient_id30$$telec2.value) !== null && _$patient_id$0$teleco10 !== void 0 ? _$patient_id$0$teleco10 : ""
-              }),
-              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId95 = _.appointmentId) === null || _$appointmentId95 === void 0 ? void 0 : (_$appointmentId95$ = _$appointmentId95[0]) === null || _$appointmentId95$ === void 0 ? void 0 : _$appointmentId95$.appno) || "",
-              date: JSON.stringify({
-                date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId96 = _.appointmentId) === null || _$appointmentId96 === void 0 ? void 0 : (_$appointmentId96$ = _$appointmentId96[0]) === null || _$appointmentId96$ === void 0 ? void 0 : _$appointmentId96$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId97 = _.appointmentId) === null || _$appointmentId97 === void 0 ? void 0 : (_$appointmentId97$ = _$appointmentId97[0]) === null || _$appointmentId97$ === void 0 ? void 0 : _$appointmentId97$.start, "DD MMM,YYYY") : "",
-                time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId98 = _.appointmentId) === null || _$appointmentId98 === void 0 ? void 0 : (_$appointmentId98$ = _$appointmentId98[0]) === null || _$appointmentId98$ === void 0 ? void 0 : _$appointmentId98$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId99 = _.appointmentId) === null || _$appointmentId99 === void 0 ? void 0 : (_$appointmentId99$ = _$appointmentId99[0]) === null || _$appointmentId99$ === void 0 ? void 0 : _$appointmentId99$.start, "hh:mm A") : ""
-              }),
+              // name: JSON.stringify({
+              //   name: makeName(_?.patient_id?.[0]?.name?.[0] || {}),
+              //   age: getAge(_?.appointmentId?.[0]?.PersonID?.[0]?.birthDay),
+              //   mrn: _?.patient_id?.[0]?.MRN || "",
+              //   gender: _?.appointmentId?.[0]?.PersonID?.[0]?.gender ?? "",
+              //   contact: _?.patient_id?.[0]?.telecom?.[0]?.value ?? ""
+              // }),
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id19 = _.patient_id) === null || _$patient_id19 === void 0 ? void 0 : (_$patient_id19$ = _$patient_id19[0]) === null || _$patient_id19$ === void 0 ? void 0 : (_$patient_id19$$name = _$patient_id19$.name) === null || _$patient_id19$$name === void 0 ? void 0 : _$patient_id19$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id20 = _.patient_id) === null || _$patient_id20 === void 0 ? void 0 : (_$patient_id20$ = _$patient_id20[0]) === null || _$patient_id20$ === void 0 ? void 0 : _$patient_id20$.MRN) || "",
+              age: getAge(_ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : (_$appointmentId55$$Pe = _$appointmentId55$.PersonID) === null || _$appointmentId55$$Pe === void 0 ? void 0 : (_$appointmentId55$$Pe2 = _$appointmentId55$$Pe[0]) === null || _$appointmentId55$$Pe2 === void 0 ? void 0 : _$appointmentId55$$Pe2.birthDay),
               visitType: (_$visit_type10 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type10 !== void 0 ? _$visit_type10 : "",
-              speciality: JSON.stringify({
-                speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId100 = _.appointmentId) === null || _$appointmentId100 === void 0 ? void 0 : (_$appointmentId100$ = _$appointmentId100[0]) === null || _$appointmentId100$ === void 0 ? void 0 : (_$appointmentId100$$S = _$appointmentId100$.SpecialtyID) === null || _$appointmentId100$$S === void 0 ? void 0 : _$appointmentId100$$S.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;
-                }).join(", "),
-                clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail23 = _.practitioner_details) === null || _$practitioner_detail23 === void 0 ? void 0 : (_$practitioner_detail24 = _$practitioner_detail23[0]) === null || _$practitioner_detail24 === void 0 ? void 0 : _$practitioner_detail24.clinic) || ""
-              }),
+              date: "".concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start, "hh:mm A") : ""),
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.appno) || "",
+              // date: JSON.stringify({
+              //   date: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "DD MMM,YYYY")
+              //     : "",
+              //   time: _?.appointmentId?.[0]?.start
+              //     ? utcTOLocal(_?.appointmentId?.[0]?.start, "hh:mm A")
+              //     : ""
+              // }),
+              // speciality: JSON.stringify({
+              //   speciality: _?.appointmentId?.[0]?.SpecialtyID?.map((spl) => {
+              //     return spl?.coding?.[0]?.display;
+              //   }).join(", "),
+              //   clinic: _?.practitioner_details?.[0]?.clinic || ""
+              // }),
               appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status10 = _.status) === null || _$status10 === void 0 ? void 0 : _$status10.display) || "",
               action: true
             };
@@ -41365,9 +41605,9 @@ var orderSetDropDown = {
   },
   diagnosisDropDown: function diagnosisDropDown(type) {
     return {
-      db_name: dbName,
+      db_name: "primarycare",
       entity: "Diagnosis",
-      filter: "Diagnosis.icdcode != Diagnosis.parenticdcode && like (Diagnosis.icdname,'%".concat(type, "%',true)"),
+      filter: "Diagnosis.icdcode != Diagnosis.parenticdcode && like (Diagnosis.icdname,'%".concat(type, "%',true) && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)"),
       return_fields: "KEEP(Diagnosis,'_id','id','_key','icdcode', 'icdname', 'parenticdcode', 'levelnumber')",
       sort: "Diagnosis.icdname"
     };
@@ -42235,13 +42475,13 @@ var consultActions = _objectSpread2(_objectSpread2(_objectSpread2(_objectSpread2
 var query$2 = {
   //FRONTDESK
   getPatientsCheckedIn: function getPatientsCheckedIn(data) {
-    return "{\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Encounter\",\n          \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && 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'\",\n          \"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:(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)}))}))})\"\n        }");
+    return "{\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Encounter\",\n          \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && 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'\",\n          \"return_fields\": \"merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {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)}))}))})\"\n        }");
   },
   getTriageDone: function getTriageDone(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Triaged' \",\n        \"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:(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)}))}))})\"\n      }");
+    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Triaged' \",\n        \"return_fields\": \"merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {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)}))}))})\"\n      }");
   },
   getVisitCompleted: function getVisitCompleted(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010'\",\n        \"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:(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)}))}))})\"\n      }");
+    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010'\",\n        \"return_fields\": \"merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {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)}))}))})\"\n      }");
   },
   getPatientsNoShows: function getPatientsNoShows(data) {
     return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Appointment\",\n        \"filter\": \"Appointment.activestatus==true && Appointment.orgid== ").concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && 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.appstatus)=='booked' && ((DATE_TIMESTAMP(DATE_NOW()/1000)-Appointment.end)/60)>30\",\n        \"return_fields\": \"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)}))}))})\"\n      }");
@@ -42358,15 +42598,17 @@ var GET_PATIENTS_CHECKED_IN = createAsyncThunk("currentVisitStatsApiSlice/getPat
         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 _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$appointmentId$$Pers3, _$appointmentId2, _$appointmentId2$, _$appointmentId2$$Per, _$appointmentId2$$Per2, _$appointmentId2$$Per3, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$appointmentId7, _$appointmentId7$, _$appointmentId7$$Spe, _$patient_id3, _$patient_id3$, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$status;
+            var _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$appointmentId, _$appointmentId$, _$appointmentId2, _$appointmentId2$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId5$$Spe, _$patient_id3, _$patient_id3$, _$patient_id4, _$patient_id4$, _$patient_id4$$teleco, _$patient_id4$$teleco2, _$status, _$appointmentId$0$id, _$appointmentId6, _$appointmentId6$, _$patient_id5, _$patient_id5$, _$patient_id5$$teleco, _$patient_id5$$teleco2, _$appointmentId$0$Per, _$appointmentId7, _$appointmentId7$, _$appointmentId7$$Per, _$appointmentId7$$Per2, _$patient_id$0$id, _$patient_id6, _$patient_id6$;
 
             return {
-              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[0]) === null || _$appointmentId$$Pers3 === void 0 ? void 0 : _$appointmentId$$Pers3.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[0]) === null || _$appointmentId2$$Per3 === void 0 ? void 0 : _$appointmentId2$$Per3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
               name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
               mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.MRN,
-              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start, "DD MMM,YYYY") : "",
-              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : (_$appointmentId7$$Spe = _$appointmentId7$.SpecialtyID) === null || _$appointmentId7$$Spe === void 0 ? void 0 : _$appointmentId7$$Spe.map(function (spl) {
+              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$ = _$appointmentId[0]) === null || _$appointmentId$ === void 0 ? void 0 : _$appointmentId$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : _$appointmentId2$.start, "DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : (_$appointmentId5$$Spe = _$appointmentId5$.SpecialtyID) === null || _$appointmentId5$$Spe === void 0 ? void 0 : _$appointmentId5$$Spe.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;
@@ -42376,7 +42618,13 @@ var GET_PATIENTS_CHECKED_IN = createAsyncThunk("currentVisitStatsApiSlice/getPat
               contact: JSON.stringify(_ === 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),
               type: _ === null || _ === void 0 ? void 0 : _.visit_type,
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display,
-              view: true
+              action: JSON.stringify({
+                appNo: (_$appointmentId$0$id = _ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.id) !== null && _$appointmentId$0$id !== void 0 ? _$appointmentId$0$id : "",
+                enId: _.id,
+                contact: _ === 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$$teleco = _$patient_id5$.telecom) === null || _$patient_id5$$teleco === void 0 ? void 0 : (_$patient_id5$$teleco2 = _$patient_id5$$teleco[0]) === null || _$patient_id5$$teleco2 === void 0 ? void 0 : _$patient_id5$$teleco2.value,
+                personId: (_$appointmentId$0$Per = _ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : (_$appointmentId7$$Per = _$appointmentId7$.PersonID) === null || _$appointmentId7$$Per === void 0 ? void 0 : (_$appointmentId7$$Per2 = _$appointmentId7$$Per[0]) === null || _$appointmentId7$$Per2 === void 0 ? void 0 : _$appointmentId7$$Per2.Id) !== null && _$appointmentId$0$Per !== void 0 ? _$appointmentId$0$Per : null,
+                patientId: (_$patient_id$0$id = _ === 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$.id) !== null && _$patient_id$0$id !== void 0 ? _$patient_id$0$id : null
+              })
             };
           }) : [];
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42421,25 +42669,33 @@ var GET_TRAIGE_DONE = createAsyncThunk("currentVisitStatsApiSlice/getTriageDone"
         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 _$appointmentId8, _$appointmentId8$, _$appointmentId8$$Per, _$appointmentId8$$Per2, _$appointmentId8$$Per3, _$appointmentId9, _$appointmentId9$, _$appointmentId9$$Per, _$appointmentId9$$Per2, _$appointmentId9$$Per3, _$patient_id5, _$patient_id5$, _$patient_id5$$name, _$patient_id6, _$patient_id6$, _$appointmentId10, _$appointmentId10$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$appointmentId13, _$appointmentId13$, _$appointmentId14, _$appointmentId14$, _$appointmentId14$$Sp, _$patient_id7, _$patient_id7$, _$patient_id8, _$patient_id8$, _$patient_id8$$teleco, _$patient_id8$$teleco2, _$status2;
+            var _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$appointmentId8, _$appointmentId8$, _$appointmentId9, _$appointmentId9$, _$appointmentId10, _$appointmentId10$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$appointmentId12$$Sp, _$patient_id9, _$patient_id9$, _$patient_id10, _$patient_id10$, _$patient_id10$$telec, _$patient_id10$$telec2, _$status2, _$appointmentId$0$id2, _$appointmentId13, _$appointmentId13$, _$patient_id11, _$patient_id11$, _$patient_id11$$telec, _$patient_id11$$telec2, _$appointmentId$0$Per2, _$appointmentId14, _$appointmentId14$, _$appointmentId14$$Pe, _$appointmentId14$$Pe2, _$patient_id$0$id2, _$patient_id12, _$patient_id12$;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : (_$appointmentId8$$Per = _$appointmentId8$.PersonID) === null || _$appointmentId8$$Per === void 0 ? void 0 : (_$appointmentId8$$Per2 = _$appointmentId8$$Per[0]) === null || _$appointmentId8$$Per2 === void 0 ? void 0 : (_$appointmentId8$$Per3 = _$appointmentId8$$Per2.photo[0]) === null || _$appointmentId8$$Per3 === void 0 ? void 0 : _$appointmentId8$$Per3.fileid) ? getImgUrl(_ === 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[0]) === null || _$appointmentId9$$Per3 === void 0 ? void 0 : _$appointmentId9$$Per3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
-              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : (_$patient_id5$ = _$patient_id5[0]) === null || _$patient_id5$ === void 0 ? void 0 : (_$patient_id5$$name = _$patient_id5$.name) === null || _$patient_id5$$name === void 0 ? void 0 : _$patient_id5$$name[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id6 = _.patient_id) === null || _$patient_id6 === void 0 ? void 0 : (_$patient_id6$ = _$patient_id6[0]) === null || _$patient_id6$ === void 0 ? void 0 : _$patient_id6$.MRN,
-              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : _$appointmentId10$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.start, "DD MMM,YYYY") : "",
-              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : _$appointmentId12$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : _$appointmentId13$.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : (_$appointmentId14$$Sp = _$appointmentId14$.SpecialtyID) === null || _$appointmentId14$$Sp === void 0 ? void 0 : _$appointmentId14$$Sp.map(function (spl) {
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id8 = _.patient_id) === null || _$patient_id8 === void 0 ? void 0 : (_$patient_id8$ = _$patient_id8[0]) === null || _$patient_id8$ === void 0 ? void 0 : _$patient_id8$.MRN,
+              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : _$appointmentId8$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : _$appointmentId9$.start, "DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : _$appointmentId10$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.start, "hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : (_$appointmentId12$$Sp = _$appointmentId12$.SpecialtyID) === null || _$appointmentId12$$Sp === void 0 ? void 0 : _$appointmentId12$$Sp.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(", "),
               ward: "Ward 1",
-              age: _ === 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$.age,
-              contact: JSON.stringify(_ === 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$$teleco = _$patient_id8$.telecom) === null || _$patient_id8$$teleco === void 0 ? void 0 : (_$patient_id8$$teleco2 = _$patient_id8$$teleco[0]) === null || _$patient_id8$$teleco2 === void 0 ? void 0 : _$patient_id8$$teleco2.value),
+              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,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : (_$patient_id10$ = _$patient_id10[0]) === null || _$patient_id10$ === void 0 ? void 0 : (_$patient_id10$$telec = _$patient_id10$.telecom) === null || _$patient_id10$$telec === void 0 ? void 0 : (_$patient_id10$$telec2 = _$patient_id10$$telec[0]) === null || _$patient_id10$$telec2 === void 0 ? void 0 : _$patient_id10$$telec2.value),
               type: _ === null || _ === void 0 ? void 0 : _.visit_type,
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status2 = _.status) === null || _$status2 === void 0 ? void 0 : _$status2.display,
-              view: true
+              action: JSON.stringify({
+                appNo: (_$appointmentId$0$id2 = _ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : _$appointmentId13$.id) !== null && _$appointmentId$0$id2 !== void 0 ? _$appointmentId$0$id2 : "",
+                enId: _.id,
+                contact: _ === 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$$telec = _$patient_id11$.telecom) === null || _$patient_id11$$telec === void 0 ? void 0 : (_$patient_id11$$telec2 = _$patient_id11$$telec[0]) === null || _$patient_id11$$telec2 === void 0 ? void 0 : _$patient_id11$$telec2.value,
+                personId: (_$appointmentId$0$Per2 = _ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : (_$appointmentId14$$Pe = _$appointmentId14$.PersonID) === null || _$appointmentId14$$Pe === void 0 ? void 0 : (_$appointmentId14$$Pe2 = _$appointmentId14$$Pe[0]) === null || _$appointmentId14$$Pe2 === void 0 ? void 0 : _$appointmentId14$$Pe2.Id) !== null && _$appointmentId$0$Per2 !== void 0 ? _$appointmentId$0$Per2 : null,
+                patientId: (_$patient_id$0$id2 = _ === 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$.id) !== null && _$patient_id$0$id2 !== void 0 ? _$patient_id$0$id2 : null
+              })
             };
           }) : [];
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42484,25 +42740,33 @@ var GET_VISIT_COMPLETED = createAsyncThunk("currentVisitStatsApiSlice/getVisitCo
         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 _$appointmentId15, _$appointmentId15$, _$appointmentId15$$Pe, _$appointmentId15$$Pe2, _$appointmentId15$$Pe3, _$appointmentId16, _$appointmentId16$, _$appointmentId16$$Pe, _$appointmentId16$$Pe2, _$appointmentId16$$Pe3, _$patient_id9, _$patient_id9$, _$patient_id9$$name, _$patient_id10, _$patient_id10$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$appointmentId19, _$appointmentId19$, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId21$$Sp, _$patient_id11, _$patient_id11$, _$patient_id12, _$patient_id12$, _$patient_id12$$telec, _$patient_id12$$telec2, _$status3;
+            var _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$appointmentId15, _$appointmentId15$, _$appointmentId16, _$appointmentId16$, _$appointmentId17, _$appointmentId17$, _$appointmentId18, _$appointmentId18$, _$appointmentId19, _$appointmentId19$, _$appointmentId19$$Sp, _$patient_id15, _$patient_id15$, _$patient_id16, _$patient_id16$, _$patient_id16$$telec, _$patient_id16$$telec2, _$status3, _$appointmentId$0$id3, _$appointmentId20, _$appointmentId20$, _$patient_id17, _$patient_id17$, _$patient_id17$$telec, _$patient_id17$$telec2, _$appointmentId$0$Per3, _$appointmentId21, _$appointmentId21$, _$appointmentId21$$Pe, _$appointmentId21$$Pe2, _$patient_id$0$id3, _$patient_id18, _$patient_id18$;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : (_$appointmentId15$$Pe = _$appointmentId15$.PersonID) === null || _$appointmentId15$$Pe === void 0 ? void 0 : (_$appointmentId15$$Pe2 = _$appointmentId15$$Pe[0]) === null || _$appointmentId15$$Pe2 === void 0 ? void 0 : (_$appointmentId15$$Pe3 = _$appointmentId15$$Pe2.photo[0]) === null || _$appointmentId15$$Pe3 === void 0 ? void 0 : _$appointmentId15$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : (_$appointmentId16$$Pe = _$appointmentId16$.PersonID) === null || _$appointmentId16$$Pe === void 0 ? void 0 : (_$appointmentId16$$Pe2 = _$appointmentId16$$Pe[0]) === null || _$appointmentId16$$Pe2 === void 0 ? void 0 : (_$appointmentId16$$Pe3 = _$appointmentId16$$Pe2.photo[0]) === null || _$appointmentId16$$Pe3 === void 0 ? void 0 : _$appointmentId16$$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_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : (_$patient_id9$$name = _$patient_id9$.name) === null || _$patient_id9$$name === void 0 ? void 0 : _$patient_id9$$name[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : (_$patient_id10$ = _$patient_id10[0]) === null || _$patient_id10$ === void 0 ? void 0 : _$patient_id10$.MRN,
-              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start, "DD MMM,YYYY") : "",
-              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : _$appointmentId19$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start, "hh:mm A") : "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : (_$appointmentId21$$Sp = _$appointmentId21$.SpecialtyID) === null || _$appointmentId21$$Sp === void 0 ? void 0 : _$appointmentId21$$Sp.map(function (spl) {
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : _$patient_id14$.MRN,
+              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : _$appointmentId16$.start, "DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : _$appointmentId17$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start, "hh:mm A") : "",
+              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$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(", "),
               ward: "Ward 1",
-              age: _ === 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$.age,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id12 = _.patient_id) === null || _$patient_id12 === void 0 ? void 0 : (_$patient_id12$ = _$patient_id12[0]) === null || _$patient_id12$ === void 0 ? void 0 : (_$patient_id12$$telec = _$patient_id12$.telecom) === null || _$patient_id12$$telec === void 0 ? void 0 : (_$patient_id12$$telec2 = _$patient_id12$$telec[0]) === null || _$patient_id12$$telec2 === void 0 ? void 0 : _$patient_id12$$telec2.value),
+              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,
+              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),
               type: _ === null || _ === void 0 ? void 0 : _.visit_type,
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status3 = _.status) === null || _$status3 === void 0 ? void 0 : _$status3.display,
-              view: true
+              action: JSON.stringify({
+                appNo: (_$appointmentId$0$id3 = _ === 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$id3 !== void 0 ? _$appointmentId$0$id3 : "",
+                enId: _.id,
+                contact: _ === null || _ === void 0 ? void 0 : (_$patient_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : (_$patient_id17$$telec = _$patient_id17$.telecom) === null || _$patient_id17$$telec === void 0 ? void 0 : (_$patient_id17$$telec2 = _$patient_id17$$telec[0]) === null || _$patient_id17$$telec2 === void 0 ? void 0 : _$patient_id17$$telec2.value,
+                personId: (_$appointmentId$0$Per3 = _ === 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.Id) !== null && _$appointmentId$0$Per3 !== void 0 ? _$appointmentId$0$Per3 : null,
+                patientId: (_$patient_id$0$id3 = _ === 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$.id) !== null && _$patient_id$0$id3 !== void 0 ? _$patient_id$0$id3 : null
+              })
             };
           }) : [];
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42547,21 +42811,27 @@ var GET_PATIENTS_NO_SHOWS = createAsyncThunk("currentVisitStatsApiSlice/getPatie
         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 _$patient_id$0$alias, _$patient_id13, _$patient_id13$, _$practitioner_detail, _$practitioner_detail2, _$practitioner_detail3, _$patient_id$0$birthD, _$patient_id14, _$patient_id14$, _$type$0$display, _$type, _$type$;
+            var _$patient_id$0$alias, _$patient_id19, _$patient_id19$, _$practitioner_detail, _$practitioner_detail2, _$practitioner_detail3, _$patient_id$0$birthD, _$patient_id20, _$patient_id20$, _$type$0$display, _$type, _$type$, _$id, _$patient_id21, _$patient_id21$, _$patient_id21$$telec, _$patient_id21$$telec2, _$PersonID$0$Id, _$PersonID, _$PersonID$, _$patient_id$0$id4, _$patient_id22, _$patient_id22$;
 
             return {
-              img: "https://www.fillmurray.com/640/360",
+              // img: "https://www.fillmurray.com/640/360",
               name: "Louis Barrett",
-              mrn: (_$patient_id$0$alias = _ === 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$.alias) !== null && _$patient_id$0$alias !== void 0 ? _$patient_id$0$alias : "",
+              mrn: (_$patient_id$0$alias = _ === 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$.alias) !== null && _$patient_id$0$alias !== void 0 ? _$patient_id$0$alias : "",
               orderDate: (_ === null || _ === void 0 ? void 0 : _.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : _.start, "DD MMM,YYYY") : "",
               orderTime: (_ === null || _ === void 0 ? void 0 : _.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : _.start, "hh:mm A") : "",
               speciality: (_$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.speciality) !== null && _$practitioner_detail !== void 0 ? _$practitioner_detail : "",
               ward: "Ward 1",
-              dob: (_$patient_id$0$birthD = _ === 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$.birthDate) !== null && _$patient_id$0$birthD !== void 0 ? _$patient_id$0$birthD : "",
+              dob: (_$patient_id$0$birthD = _ === 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$.birthDate) !== null && _$patient_id$0$birthD !== void 0 ? _$patient_id$0$birthD : "",
               contact: "Contact",
               type: (_$type$0$display = _ === null || _ === void 0 ? void 0 : (_$type = _.type) === null || _$type === void 0 ? void 0 : (_$type$ = _$type[0]) === null || _$type$ === void 0 ? void 0 : _$type$.display) !== null && _$type$0$display !== void 0 ? _$type$0$display : "",
               encounterStatus: "Pending",
-              view: true
+              action: JSON.stringify({
+                appNo: (_$id = _ === null || _ === void 0 ? void 0 : _.id) !== null && _$id !== void 0 ? _$id : "",
+                enId: _.id,
+                contact: _ === null || _ === void 0 ? void 0 : (_$patient_id21 = _.patient_id) === null || _$patient_id21 === void 0 ? void 0 : (_$patient_id21$ = _$patient_id21[0]) === null || _$patient_id21$ === void 0 ? void 0 : (_$patient_id21$$telec = _$patient_id21$.telecom) === null || _$patient_id21$$telec === void 0 ? void 0 : (_$patient_id21$$telec2 = _$patient_id21$$telec[0]) === null || _$patient_id21$$telec2 === void 0 ? void 0 : _$patient_id21$$telec2.value,
+                personId: (_$PersonID$0$Id = _ === null || _ === void 0 ? void 0 : (_$PersonID = _.PersonID) === null || _$PersonID === void 0 ? void 0 : (_$PersonID$ = _$PersonID[0]) === null || _$PersonID$ === void 0 ? void 0 : _$PersonID$.Id) !== null && _$PersonID$0$Id !== void 0 ? _$PersonID$0$Id : null,
+                patientId: (_$patient_id$0$id4 = _ === 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$.id) !== null && _$patient_id$0$id4 !== void 0 ? _$patient_id$0$id4 : null
+              })
             };
           }) : [];
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42607,28 +42877,30 @@ var GET_PATIENTS_CHECKED_IN_NURSE = createAsyncThunk("currentVisitStatsApiSlice/
         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 _$appointmentId22, _$appointmentId22$, _$appointmentId22$$Pe, _$appointmentId22$$Pe2, _$appointmentId22$$Pe3, _$appointmentId23, _$appointmentId23$, _$appointmentId23$$Pe, _$appointmentId23$$Pe2, _$appointmentId23$$Pe3, _$patient_id15, _$patient_id15$, _$patient_id15$$name, _$patient_id16, _$patient_id16$, _$patient_id17, _$patient_id17$, _$patient_id18, _$patient_id18$, _$patient_id18$$gende, _$patient_id19, _$patient_id19$, _$patient_id19$$telec, _$patient_id19$$telec2, _$appointmentId24, _$appointmentId24$, _$appointmentId25, _$appointmentId25$, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId29$$Sp, _$practitioner_detail4, _$practitioner_detail5, _$status4;
+            var _$patient_id23, _$patient_id23$, _$patient_id23$$name, _$patient_id24, _$patient_id24$, _$patient_id25, _$patient_id25$, _$patient_id26, _$patient_id26$, _$patient_id26$$gende, _$patient_id27, _$patient_id27$, _$patient_id27$$telec, _$patient_id27$$telec2, _$appointmentId22, _$appointmentId22$, _$appointmentId23, _$appointmentId23$, _$appointmentId24, _$appointmentId24$, _$appointmentId25, _$appointmentId25$, _$appointmentId26, _$appointmentId26$, _$appointmentId27, _$appointmentId27$, _$appointmentId27$$Sp, _$practitioner_detail4, _$practitioner_detail5, _$status4;
 
             return {
-              img: (_ === 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$$Pe3 = _$appointmentId22$$Pe2.photo[0]) === null || _$appointmentId22$$Pe3 === void 0 ? void 0 : _$appointmentId22$$Pe3.fileid) ? getImgUrl(_ === 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[0]) === null || _$appointmentId23$$Pe3 === void 0 ? void 0 : _$appointmentId23$$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_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : (_$patient_id15$$name = _$patient_id15$.name) === null || _$patient_id15$$name === void 0 ? void 0 : _$patient_id15$$name[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id16 = _.patient_id) === null || _$patient_id16 === void 0 ? void 0 : (_$patient_id16$ = _$patient_id16[0]) === null || _$patient_id16$ === void 0 ? void 0 : _$patient_id16$.MRN,
-              age: _ === 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$.age,
-              gender: _ === 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$$gende = _$patient_id18$.gender) === null || _$patient_id18$$gende === void 0 ? void 0 : _$patient_id18$$gende.display,
-              contact: JSON.stringify(_ === 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),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : _$appointmentId24$.appno,
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : _$appointmentId25$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start, "DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.start, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : (_$patient_id23$$name = _$patient_id23$.name) === null || _$patient_id23$$name === void 0 ? void 0 : _$patient_id23$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id24 = _.patient_id) === null || _$patient_id24 === void 0 ? void 0 : (_$patient_id24$ = _$patient_id24[0]) === null || _$patient_id24$ === void 0 ? void 0 : _$patient_id24$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : _$patient_id25$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : (_$patient_id26$$gende = _$patient_id26$.gender) === null || _$patient_id26$$gende === void 0 ? void 0 : _$patient_id26$$gende.display,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : (_$patient_id27$$telec = _$patient_id27$.telecom) === null || _$patient_id27$$telec === void 0 ? void 0 : (_$patient_id27$$telec2 = _$patient_id27$$telec[0]) === null || _$patient_id27$$telec2 === void 0 ? void 0 : _$patient_id27$$telec2.value),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId22 = _.appointmentId) === null || _$appointmentId22 === void 0 ? void 0 : (_$appointmentId22$ = _$appointmentId22[0]) === null || _$appointmentId22$ === void 0 ? void 0 : _$appointmentId22$.appno,
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : _$appointmentId23$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : _$appointmentId24$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : _$appointmentId25$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start, "hh:mm A") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : (_$appointmentId29$$Sp = _$appointmentId29$.SpecialtyID) === null || _$appointmentId29$$Sp === void 0 ? void 0 : _$appointmentId29$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : (_$appointmentId27$$Sp = _$appointmentId27$.SpecialtyID) === null || _$appointmentId27$$Sp === void 0 ? void 0 : _$appointmentId27$$Sp.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 : (_$practitioner_detail4 = _.practitioner_details) === null || _$practitioner_detail4 === void 0 ? void 0 : (_$practitioner_detail5 = _$practitioner_detail4[0]) === null || _$practitioner_detail5 === void 0 ? void 0 : _$practitioner_detail5.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              action: true
             };
           }) : [];
           return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42673,28 +42945,31 @@ var GET_VISIT_COMPLETED_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getV
         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 _$appointmentId30, _$appointmentId30$, _$appointmentId30$$Pe, _$appointmentId30$$Pe2, _$appointmentId30$$Pe3, _$appointmentId31, _$appointmentId31$, _$appointmentId31$$Pe, _$appointmentId31$$Pe2, _$appointmentId31$$Pe3, _$patient_id20, _$patient_id20$, _$patient_id20$$name, _$patient_id21, _$patient_id21$, _$patient_id22, _$patient_id22$, _$patient_id23, _$patient_id23$, _$patient_id23$$gende, _$patient_id24, _$patient_id24$, _$patient_id24$$telec, _$patient_id24$$telec2, _$appointmentId32, _$appointmentId32$, _$appointmentId33, _$appointmentId33$, _$appointmentId34, _$appointmentId34$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId37$$Sp, _$practitioner_detail6, _$practitioner_detail7, _$status5;
+            var _$patient_id28, _$patient_id28$, _$patient_id28$$name, _$patient_id29, _$patient_id29$, _$patient_id30, _$patient_id30$, _$patient_id31, _$patient_id31$, _$patient_id31$$gende, _$patient_id32, _$patient_id32$, _$patient_id32$$telec, _$patient_id32$$telec2, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId30, _$appointmentId30$, _$appointmentId31, _$appointmentId31$, _$appointmentId32, _$appointmentId32$, _$appointmentId33, _$appointmentId33$, _$appointmentId33$$Sp, _$practitioner_detail6, _$practitioner_detail7, _$status5;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : (_$appointmentId30$$Pe = _$appointmentId30$.PersonID) === null || _$appointmentId30$$Pe === void 0 ? void 0 : (_$appointmentId30$$Pe2 = _$appointmentId30$$Pe[0]) === null || _$appointmentId30$$Pe2 === void 0 ? void 0 : (_$appointmentId30$$Pe3 = _$appointmentId30$$Pe2.photo[0]) === null || _$appointmentId30$$Pe3 === void 0 ? void 0 : _$appointmentId30$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : (_$appointmentId31$$Pe = _$appointmentId31$.PersonID) === null || _$appointmentId31$$Pe === void 0 ? void 0 : (_$appointmentId31$$Pe2 = _$appointmentId31$$Pe[0]) === null || _$appointmentId31$$Pe2 === void 0 ? void 0 : (_$appointmentId31$$Pe3 = _$appointmentId31$$Pe2.photo[0]) === null || _$appointmentId31$$Pe3 === void 0 ? void 0 : _$appointmentId31$$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_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,
-              age: _ === 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$.age,
-              gender: _ === 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$$gende = _$patient_id23$.gender) === null || _$patient_id23$$gende === void 0 ? void 0 : _$patient_id23$$gende.display,
-              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),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : _$appointmentId32$.appno,
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : _$appointmentId33$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.start, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : (_$patient_id28$$name = _$patient_id28$.name) === null || _$patient_id28$$name === void 0 ? void 0 : _$patient_id28$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id29 = _.patient_id) === null || _$patient_id29 === void 0 ? void 0 : (_$patient_id29$ = _$patient_id29[0]) === null || _$patient_id29$ === void 0 ? void 0 : _$patient_id29$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id30 = _.patient_id) === null || _$patient_id30 === void 0 ? void 0 : (_$patient_id30$ = _$patient_id30[0]) === null || _$patient_id30$ === void 0 ? void 0 : _$patient_id30$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : (_$patient_id31$$gende = _$patient_id31$.gender) === null || _$patient_id31$$gende === void 0 ? void 0 : _$patient_id31$$gende.display,
+              contact: JSON.stringify(_ === 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$$telec = _$patient_id32$.telecom) === null || _$patient_id32$$telec === void 0 ? void 0 : (_$patient_id32$$telec2 = _$patient_id32$$telec[0]) === null || _$patient_id32$$telec2 === void 0 ? void 0 : _$patient_id32$$telec2.value),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.appno,
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : _$appointmentId29$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : _$appointmentId30$.start, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : _$appointmentId31$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : _$appointmentId32$.start, "hh:mm A") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : (_$appointmentId37$$Sp = _$appointmentId37$.SpecialtyID) === null || _$appointmentId37$$Sp === void 0 ? void 0 : _$appointmentId37$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : (_$appointmentId33$$Sp = _$appointmentId33$.SpecialtyID) === null || _$appointmentId33$$Sp === void 0 ? void 0 : _$appointmentId33$$Sp.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 : (_$practitioner_detail6 = _.practitioner_details) === null || _$practitioner_detail6 === void 0 ? void 0 : (_$practitioner_detail7 = _$practitioner_detail6[0]) === null || _$practitioner_detail7 === void 0 ? void 0 : _$practitioner_detail7.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status5 = _.status) === null || _$status5 === void 0 ? void 0 : _$status5.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42739,14 +43014,14 @@ var GET_PATIENTS_NO_SHOWS_NURSE = createAsyncThunk("currentVisitStatsApiSlice/ge
         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 _$PersonID, _$PersonID$, _$PersonID$$name, _$PersonID$$name$, _$PersonID2, _$PersonID2$, _$type2, _$type2$, _$practitioner_detail8, _$practitioner_detail9;
+            var _$PersonID2, _$PersonID2$, _$PersonID2$$name, _$PersonID2$$name$, _$PersonID3, _$PersonID3$, _$type2, _$type2$, _$practitioner_detail8, _$practitioner_detail9;
 
             return {
-              img: "https://www.fillmurray.com/640/360",
-              name: _ === null || _ === void 0 ? void 0 : (_$PersonID = _.PersonID) === null || _$PersonID === void 0 ? void 0 : (_$PersonID$ = _$PersonID[0]) === null || _$PersonID$ === void 0 ? void 0 : (_$PersonID$$name = _$PersonID$.name) === null || _$PersonID$$name === void 0 ? void 0 : (_$PersonID$$name$ = _$PersonID$$name[0]) === null || _$PersonID$$name$ === void 0 ? void 0 : _$PersonID$$name$.given,
+              // img: "https://www.fillmurray.com/640/360",
+              name: _ === null || _ === void 0 ? void 0 : (_$PersonID2 = _.PersonID) === null || _$PersonID2 === void 0 ? void 0 : (_$PersonID2$ = _$PersonID2[0]) === null || _$PersonID2$ === void 0 ? void 0 : (_$PersonID2$$name = _$PersonID2$.name) === null || _$PersonID2$$name === void 0 ? void 0 : (_$PersonID2$$name$ = _$PersonID2$$name[0]) === null || _$PersonID2$$name$ === void 0 ? void 0 : _$PersonID2$$name$.given,
               mrn: "MRN",
               age: "Age",
-              gender: _ === null || _ === void 0 ? void 0 : (_$PersonID2 = _.PersonID) === null || _$PersonID2 === void 0 ? void 0 : (_$PersonID2$ = _$PersonID2[0]) === null || _$PersonID2$ === void 0 ? void 0 : _$PersonID2$.gender,
+              gender: _ === null || _ === void 0 ? void 0 : (_$PersonID3 = _.PersonID) === null || _$PersonID3 === void 0 ? void 0 : (_$PersonID3$ = _$PersonID3[0]) === null || _$PersonID3$ === void 0 ? void 0 : _$PersonID3$.gender,
               contact: "Contact",
               refNo: "Ref No",
               date: (_ === null || _ === void 0 ? void 0 : _.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : _.start, "DD MMM,YYYY") : "",
@@ -42755,8 +43030,9 @@ var GET_PATIENTS_NO_SHOWS_NURSE = createAsyncThunk("currentVisitStatsApiSlice/ge
               speciality: _ === null || _ === void 0 ? void 0 : (_$practitioner_detail8 = _.practitioner_details) === null || _$practitioner_detail8 === void 0 ? void 0 : (_$practitioner_detail9 = _$practitioner_detail8[0]) === null || _$practitioner_detail9 === void 0 ? void 0 : _$practitioner_detail9.speciality,
               clinic: "Clinic",
               encounterStatus: "Pending",
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42801,28 +43077,31 @@ var GET_TRAIGE_DONE_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getTriag
         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 _$appointmentId38, _$appointmentId38$, _$appointmentId38$$Pe, _$appointmentId38$$Pe2, _$appointmentId38$$Pe3, _$appointmentId39, _$appointmentId39$, _$appointmentId39$$Pe, _$appointmentId39$$Pe2, _$appointmentId39$$Pe3, _$patient_id25, _$patient_id25$, _$patient_id25$$name, _$patient_id26, _$patient_id26$, _$patient_id27, _$patient_id27$, _$patient_id28, _$patient_id28$, _$patient_id28$$gende, _$patient_id29, _$patient_id29$, _$patient_id29$$telec, _$patient_id29$$telec2, _$appointmentId40, _$appointmentId40$, _$appointmentId41, _$appointmentId41$, _$appointmentId42, _$appointmentId42$, _$appointmentId43, _$appointmentId43$, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId45$$Sp, _$practitioner_detail10, _$practitioner_detail11, _$status6;
+            var _$patient_id33, _$patient_id33$, _$patient_id33$$name, _$patient_id34, _$patient_id34$, _$patient_id35, _$patient_id35$, _$patient_id36, _$patient_id36$, _$patient_id36$$gende, _$patient_id37, _$patient_id37$, _$patient_id37$$telec, _$patient_id37$$telec2, _$appointmentId34, _$appointmentId34$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId39$$Sp, _$practitioner_detail10, _$practitioner_detail11, _$status6;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : (_$appointmentId38$$Pe = _$appointmentId38$.PersonID) === null || _$appointmentId38$$Pe === void 0 ? void 0 : (_$appointmentId38$$Pe2 = _$appointmentId38$$Pe[0]) === null || _$appointmentId38$$Pe2 === void 0 ? void 0 : (_$appointmentId38$$Pe3 = _$appointmentId38$$Pe2.photo[0]) === null || _$appointmentId38$$Pe3 === void 0 ? void 0 : _$appointmentId38$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : (_$appointmentId39$$Pe = _$appointmentId39$.PersonID) === null || _$appointmentId39$$Pe === void 0 ? void 0 : (_$appointmentId39$$Pe2 = _$appointmentId39$$Pe[0]) === null || _$appointmentId39$$Pe2 === void 0 ? void 0 : (_$appointmentId39$$Pe3 = _$appointmentId39$$Pe2.photo[0]) === null || _$appointmentId39$$Pe3 === void 0 ? void 0 : _$appointmentId39$$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_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : (_$patient_id25$$name = _$patient_id25$.name) === null || _$patient_id25$$name === void 0 ? void 0 : _$patient_id25$$name[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : _$patient_id26$.MRN,
-              age: _ === 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$.age,
-              gender: _ === 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$$gende = _$patient_id28$.gender) === null || _$patient_id28$$gende === void 0 ? void 0 : _$patient_id28$$gende.display,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id29 = _.patient_id) === null || _$patient_id29 === void 0 ? void 0 : (_$patient_id29$ = _$patient_id29[0]) === null || _$patient_id29$ === void 0 ? void 0 : (_$patient_id29$$telec = _$patient_id29$.telecom) === null || _$patient_id29$$telec === void 0 ? void 0 : (_$patient_id29$$telec2 = _$patient_id29$$telec[0]) === null || _$patient_id29$$telec2 === void 0 ? void 0 : _$patient_id29$$telec2.value),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.appno,
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : _$appointmentId41$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.start, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id33 = _.patient_id) === null || _$patient_id33 === void 0 ? void 0 : (_$patient_id33$ = _$patient_id33[0]) === null || _$patient_id33$ === void 0 ? void 0 : (_$patient_id33$$name = _$patient_id33$.name) === null || _$patient_id33$$name === void 0 ? void 0 : _$patient_id33$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id34 = _.patient_id) === null || _$patient_id34 === void 0 ? void 0 : (_$patient_id34$ = _$patient_id34[0]) === null || _$patient_id34$ === void 0 ? void 0 : _$patient_id34$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : (_$patient_id35$ = _$patient_id35[0]) === null || _$patient_id35$ === void 0 ? void 0 : _$patient_id35$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id36 = _.patient_id) === null || _$patient_id36 === void 0 ? void 0 : (_$patient_id36$ = _$patient_id36[0]) === null || _$patient_id36$ === void 0 ? void 0 : (_$patient_id36$$gende = _$patient_id36$.gender) === null || _$patient_id36$$gende === void 0 ? void 0 : _$patient_id36$$gende.display,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id37 = _.patient_id) === null || _$patient_id37 === void 0 ? void 0 : (_$patient_id37$ = _$patient_id37[0]) === null || _$patient_id37$ === void 0 ? void 0 : (_$patient_id37$$telec = _$patient_id37$.telecom) === null || _$patient_id37$$telec === void 0 ? void 0 : (_$patient_id37$$telec2 = _$patient_id37$$telec[0]) === null || _$patient_id37$$telec2 === void 0 ? void 0 : _$patient_id37$$telec2.value),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.appno,
+              date: (_ === 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") : "",
+              time: (_ === 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") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : (_$appointmentId45$$Sp = _$appointmentId45$.SpecialtyID) === null || _$appointmentId45$$Sp === void 0 ? void 0 : _$appointmentId45$$Sp.map(function (spl) {
+              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 _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 : (_$practitioner_detail10 = _.practitioner_details) === null || _$practitioner_detail10 === void 0 ? void 0 : (_$practitioner_detail11 = _$practitioner_detail10[0]) === null || _$practitioner_detail11 === void 0 ? void 0 : _$practitioner_detail11.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status6 = _.status) === null || _$status6 === void 0 ? void 0 : _$status6.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42868,14 +43147,14 @@ var GET_PATIENTS_NO_SHOWS_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/g
         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 _$PersonID3, _$PersonID3$, _$PersonID3$$name, _$PersonID3$$name$, _$PersonID4, _$PersonID4$, _$type3, _$type3$, _$practitioner_detail12, _$practitioner_detail13;
+            var _$PersonID4, _$PersonID4$, _$PersonID4$$name, _$PersonID4$$name$, _$PersonID5, _$PersonID5$, _$type3, _$type3$, _$practitioner_detail12, _$practitioner_detail13;
 
             return {
-              img: "https://www.fillmurray.com/640/360",
-              name: _ === null || _ === void 0 ? void 0 : (_$PersonID3 = _.PersonID) === null || _$PersonID3 === void 0 ? void 0 : (_$PersonID3$ = _$PersonID3[0]) === null || _$PersonID3$ === void 0 ? void 0 : (_$PersonID3$$name = _$PersonID3$.name) === null || _$PersonID3$$name === void 0 ? void 0 : (_$PersonID3$$name$ = _$PersonID3$$name[0]) === null || _$PersonID3$$name$ === void 0 ? void 0 : _$PersonID3$$name$.given,
+              // img: "https://www.fillmurray.com/640/360",
+              name: _ === null || _ === void 0 ? void 0 : (_$PersonID4 = _.PersonID) === null || _$PersonID4 === void 0 ? void 0 : (_$PersonID4$ = _$PersonID4[0]) === null || _$PersonID4$ === void 0 ? void 0 : (_$PersonID4$$name = _$PersonID4$.name) === null || _$PersonID4$$name === void 0 ? void 0 : (_$PersonID4$$name$ = _$PersonID4$$name[0]) === null || _$PersonID4$$name$ === void 0 ? void 0 : _$PersonID4$$name$.given,
               mrn: "MRN",
               age: "Age",
-              gender: _ === null || _ === void 0 ? void 0 : (_$PersonID4 = _.PersonID) === null || _$PersonID4 === void 0 ? void 0 : (_$PersonID4$ = _$PersonID4[0]) === null || _$PersonID4$ === void 0 ? void 0 : _$PersonID4$.gender,
+              gender: _ === null || _ === void 0 ? void 0 : (_$PersonID5 = _.PersonID) === null || _$PersonID5 === void 0 ? void 0 : (_$PersonID5$ = _$PersonID5[0]) === null || _$PersonID5$ === void 0 ? void 0 : _$PersonID5$.gender,
               contact: "Contact",
               refNo: "Ref No",
               date: (_ === null || _ === void 0 ? void 0 : _.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : _.start, "DD MMM,YYYY") : "",
@@ -42884,8 +43163,9 @@ var GET_PATIENTS_NO_SHOWS_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/g
               speciality: _ === null || _ === void 0 ? void 0 : (_$practitioner_detail12 = _.practitioner_details) === null || _$practitioner_detail12 === void 0 ? void 0 : (_$practitioner_detail13 = _$practitioner_detail12[0]) === null || _$practitioner_detail13 === void 0 ? void 0 : _$practitioner_detail13.speciality,
               clinic: "Clinic",
               encounterStatus: "Pending",
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42930,28 +43210,31 @@ var GET_PATIENTS_CHECKED_IN_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice
         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 _$appointmentId46, _$appointmentId46$, _$appointmentId46$$Pe, _$appointmentId46$$Pe2, _$appointmentId46$$Pe3, _$appointmentId47, _$appointmentId47$, _$appointmentId47$$Pe, _$appointmentId47$$Pe2, _$appointmentId47$$Pe3, _$patient_id30, _$patient_id30$, _$patient_id30$$name, _$patient_id31, _$patient_id31$, _$patient_id32, _$patient_id32$, _$patient_id33, _$patient_id33$, _$patient_id33$$gende, _$patient_id34, _$patient_id34$, _$patient_id34$$telec, _$patient_id34$$telec2, _$appointmentId48, _$appointmentId48$, _$appointmentId49, _$appointmentId49$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId53$$Sp, _$practitioner_detail14, _$practitioner_detail15, _$status7;
+            var _$patient_id38, _$patient_id38$, _$patient_id38$$name, _$patient_id39, _$patient_id39$, _$patient_id40, _$patient_id40$, _$patient_id41, _$patient_id41$, _$patient_id41$$gende, _$patient_id42, _$patient_id42$, _$patient_id42$$telec, _$patient_id42$$telec2, _$appointmentId40, _$appointmentId40$, _$appointmentId41, _$appointmentId41$, _$appointmentId42, _$appointmentId42$, _$appointmentId43, _$appointmentId43$, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId45$$Sp, _$practitioner_detail14, _$practitioner_detail15, _$status7;
 
             return {
-              img: (_ === 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) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : (_$appointmentId47$$Pe = _$appointmentId47$.PersonID) === null || _$appointmentId47$$Pe === void 0 ? void 0 : (_$appointmentId47$$Pe2 = _$appointmentId47$$Pe[0]) === null || _$appointmentId47$$Pe2 === void 0 ? void 0 : (_$appointmentId47$$Pe3 = _$appointmentId47$$Pe2.photo[0]) === null || _$appointmentId47$$Pe3 === void 0 ? void 0 : _$appointmentId47$$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_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,
-              age: _ === 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$.age,
-              gender: _ === 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$$gende = _$patient_id33$.gender) === null || _$patient_id33$$gende === void 0 ? void 0 : _$patient_id33$$gende.display,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id34 = _.patient_id) === null || _$patient_id34 === void 0 ? void 0 : (_$patient_id34$ = _$patient_id34[0]) === null || _$patient_id34$ === void 0 ? void 0 : (_$patient_id34$$telec = _$patient_id34$.telecom) === null || _$patient_id34$$telec === void 0 ? void 0 : (_$patient_id34$$telec2 = _$patient_id34$$telec[0]) === null || _$patient_id34$$telec2 === void 0 ? void 0 : _$patient_id34$$telec2.value),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : _$appointmentId48$.appno,
-              date: (_ === 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, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id38 = _.patient_id) === null || _$patient_id38 === void 0 ? void 0 : (_$patient_id38$ = _$patient_id38[0]) === null || _$patient_id38$ === void 0 ? void 0 : (_$patient_id38$$name = _$patient_id38$.name) === null || _$patient_id38$$name === void 0 ? void 0 : _$patient_id38$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id39 = _.patient_id) === null || _$patient_id39 === void 0 ? void 0 : (_$patient_id39$ = _$patient_id39[0]) === null || _$patient_id39$ === void 0 ? void 0 : _$patient_id39$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id40 = _.patient_id) === null || _$patient_id40 === void 0 ? void 0 : (_$patient_id40$ = _$patient_id40[0]) === null || _$patient_id40$ === void 0 ? void 0 : _$patient_id40$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id41 = _.patient_id) === null || _$patient_id41 === void 0 ? void 0 : (_$patient_id41$ = _$patient_id41[0]) === null || _$patient_id41$ === void 0 ? void 0 : (_$patient_id41$$gende = _$patient_id41$.gender) === null || _$patient_id41$$gende === void 0 ? void 0 : _$patient_id41$$gende.display,
+              contact: JSON.stringify(_ === 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),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : _$appointmentId40$.appno,
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : _$appointmentId41$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.start, "DD MMM,YYYY") : "",
+              time: (_ === 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, "hh:mm A") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : (_$appointmentId53$$Sp = _$appointmentId53$.SpecialtyID) === null || _$appointmentId53$$Sp === void 0 ? void 0 : _$appointmentId53$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : (_$appointmentId45$$Sp = _$appointmentId45$.SpecialtyID) === null || _$appointmentId45$$Sp === void 0 ? void 0 : _$appointmentId45$$Sp.map(function (spl) {
                 var _spl$coding7, _spl$coding7$;
 
                 return spl === null || spl === void 0 ? void 0 : (_spl$coding7 = spl.coding) === null || _spl$coding7 === void 0 ? void 0 : (_spl$coding7$ = _spl$coding7[0]) === null || _spl$coding7$ === void 0 ? void 0 : _spl$coding7$.display;
               }).join(", "),
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail14 = _.practitioner_details) === null || _$practitioner_detail14 === void 0 ? void 0 : (_$practitioner_detail15 = _$practitioner_detail14[0]) === null || _$practitioner_detail15 === void 0 ? void 0 : _$practitioner_detail15.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status7 = _.status) === null || _$status7 === void 0 ? void 0 : _$status7.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -42996,28 +43279,31 @@ var GET_VISIT_COMPLETED_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/get
         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 _$appointmentId54, _$appointmentId54$, _$appointmentId54$$Pe, _$appointmentId54$$Pe2, _$appointmentId54$$Pe3, _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Pe, _$appointmentId55$$Pe2, _$appointmentId55$$Pe3, _$patient_id35, _$patient_id35$, _$patient_id35$$name, _$patient_id36, _$patient_id36$, _$patient_id37, _$patient_id37$, _$patient_id38, _$patient_id38$, _$patient_id38$$gende, _$patient_id39, _$patient_id39$, _$patient_id39$$telec, _$patient_id39$$telec2, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$appointmentId61, _$appointmentId61$, _$appointmentId61$$Sp, _$practitioner_detail16, _$practitioner_detail17, _$status8;
+            var _$patient_id43, _$patient_id43$, _$patient_id43$$name, _$patient_id44, _$patient_id44$, _$patient_id45, _$patient_id45$, _$patient_id46, _$patient_id46$, _$patient_id46$$gende, _$patient_id47, _$patient_id47$, _$patient_id47$$telec, _$patient_id47$$telec2, _$appointmentId46, _$appointmentId46$, _$appointmentId47, _$appointmentId47$, _$appointmentId48, _$appointmentId48$, _$appointmentId49, _$appointmentId49$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId51$$Sp, _$practitioner_detail16, _$practitioner_detail17, _$status8;
 
             return {
-              img: (_ === 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$$Pe3 = _$appointmentId54$$Pe2.photo[0]) === null || _$appointmentId54$$Pe3 === void 0 ? void 0 : _$appointmentId54$$Pe3.fileid) ? getImgUrl(_ === 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[0]) === null || _$appointmentId55$$Pe3 === void 0 ? void 0 : _$appointmentId55$$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_id35 = _.patient_id) === null || _$patient_id35 === void 0 ? void 0 : (_$patient_id35$ = _$patient_id35[0]) === null || _$patient_id35$ === void 0 ? void 0 : (_$patient_id35$$name = _$patient_id35$.name) === null || _$patient_id35$$name === void 0 ? void 0 : _$patient_id35$$name[0]) || {}),
-              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id36 = _.patient_id) === null || _$patient_id36 === void 0 ? void 0 : (_$patient_id36$ = _$patient_id36[0]) === null || _$patient_id36$ === void 0 ? void 0 : _$patient_id36$.MRN,
-              age: _ === 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$.age,
-              gender: _ === 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$$gende = _$patient_id38$.gender) === null || _$patient_id38$$gende === void 0 ? void 0 : _$patient_id38$$gende.display,
-              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id39 = _.patient_id) === null || _$patient_id39 === void 0 ? void 0 : (_$patient_id39$ = _$patient_id39[0]) === null || _$patient_id39$ === void 0 ? void 0 : (_$patient_id39$$telec = _$patient_id39$.telecom) === null || _$patient_id39$$telec === void 0 ? void 0 : (_$patient_id39$$telec2 = _$patient_id39$$telec[0]) === null || _$patient_id39$$telec2 === void 0 ? void 0 : _$patient_id39$$telec2.value),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.appno,
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : _$appointmentId57$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id43 = _.patient_id) === null || _$patient_id43 === void 0 ? void 0 : (_$patient_id43$ = _$patient_id43[0]) === null || _$patient_id43$ === void 0 ? void 0 : (_$patient_id43$$name = _$patient_id43$.name) === null || _$patient_id43$$name === void 0 ? void 0 : _$patient_id43$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id44 = _.patient_id) === null || _$patient_id44 === void 0 ? void 0 : (_$patient_id44$ = _$patient_id44[0]) === null || _$patient_id44$ === void 0 ? void 0 : _$patient_id44$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id45 = _.patient_id) === null || _$patient_id45 === void 0 ? void 0 : (_$patient_id45$ = _$patient_id45[0]) === null || _$patient_id45$ === void 0 ? void 0 : _$patient_id45$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id46 = _.patient_id) === null || _$patient_id46 === void 0 ? void 0 : (_$patient_id46$ = _$patient_id46[0]) === null || _$patient_id46$ === void 0 ? void 0 : (_$patient_id46$$gende = _$patient_id46$.gender) === null || _$patient_id46$$gende === void 0 ? void 0 : _$patient_id46$$gende.display,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id47 = _.patient_id) === null || _$patient_id47 === void 0 ? void 0 : (_$patient_id47$ = _$patient_id47[0]) === null || _$patient_id47$ === void 0 ? void 0 : (_$patient_id47$$telec = _$patient_id47$.telecom) === null || _$patient_id47$$telec === void 0 ? void 0 : (_$patient_id47$$telec2 = _$patient_id47$$telec[0]) === null || _$patient_id47$$telec2 === void 0 ? void 0 : _$patient_id47$$telec2.value),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.appno,
+              date: (_ === 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") : "",
+              time: (_ === 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") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : (_$appointmentId61$$Sp = _$appointmentId61$.SpecialtyID) === null || _$appointmentId61$$Sp === void 0 ? void 0 : _$appointmentId61$$Sp.map(function (spl) {
+              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$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;
               }).join(", "),
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail16 = _.practitioner_details) === null || _$practitioner_detail16 === void 0 ? void 0 : (_$practitioner_detail17 = _$practitioner_detail16[0]) === null || _$practitioner_detail17 === void 0 ? void 0 : _$practitioner_detail17.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status8 = _.status) === null || _$status8 === void 0 ? void 0 : _$status8.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -43062,28 +43348,31 @@ var GET_TRAIGE_DONE_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/getTria
         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 _$appointmentId62, _$appointmentId62$, _$appointmentId62$$Pe, _$appointmentId62$$Pe2, _$appointmentId62$$Pe3, _$appointmentId63, _$appointmentId63$, _$appointmentId63$$Pe, _$appointmentId63$$Pe2, _$appointmentId63$$Pe3, _$patient_id40, _$patient_id40$, _$patient_id40$$name, _$patient_id41, _$patient_id41$, _$patient_id42, _$patient_id42$, _$patient_id43, _$patient_id43$, _$patient_id43$$gende, _$patient_id44, _$patient_id44$, _$patient_id44$$telec, _$patient_id44$$telec2, _$appointmentId64, _$appointmentId64$, _$appointmentId65, _$appointmentId65$, _$appointmentId66, _$appointmentId66$, _$appointmentId67, _$appointmentId67$, _$appointmentId68, _$appointmentId68$, _$appointmentId69, _$appointmentId69$, _$appointmentId69$$Sp, _$practitioner_detail18, _$practitioner_detail19, _$status9;
+            var _$patient_id48, _$patient_id48$, _$patient_id48$$name, _$patient_id49, _$patient_id49$, _$patient_id50, _$patient_id50$, _$patient_id51, _$patient_id51$, _$patient_id51$$gende, _$patient_id52, _$patient_id52$, _$patient_id52$$telec, _$patient_id52$$telec2, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId54, _$appointmentId54$, _$appointmentId55, _$appointmentId55$, _$appointmentId56, _$appointmentId56$, _$appointmentId57, _$appointmentId57$, _$appointmentId57$$Sp, _$practitioner_detail18, _$practitioner_detail19, _$status9;
 
             return {
-              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : (_$appointmentId62$$Pe = _$appointmentId62$.PersonID) === null || _$appointmentId62$$Pe === void 0 ? void 0 : (_$appointmentId62$$Pe2 = _$appointmentId62$$Pe[0]) === null || _$appointmentId62$$Pe2 === void 0 ? void 0 : (_$appointmentId62$$Pe3 = _$appointmentId62$$Pe2.photo[0]) === null || _$appointmentId62$$Pe3 === void 0 ? void 0 : _$appointmentId62$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : (_$appointmentId63$$Pe = _$appointmentId63$.PersonID) === null || _$appointmentId63$$Pe === void 0 ? void 0 : (_$appointmentId63$$Pe2 = _$appointmentId63$$Pe[0]) === null || _$appointmentId63$$Pe2 === void 0 ? void 0 : (_$appointmentId63$$Pe3 = _$appointmentId63$$Pe2.photo[0]) === null || _$appointmentId63$$Pe3 === void 0 ? void 0 : _$appointmentId63$$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_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,
-              age: _ === 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$.age,
-              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id43 = _.patient_id) === null || _$patient_id43 === void 0 ? void 0 : (_$patient_id43$ = _$patient_id43[0]) === null || _$patient_id43$ === void 0 ? void 0 : (_$patient_id43$$gende = _$patient_id43$.gender) === null || _$patient_id43$$gende === void 0 ? void 0 : _$patient_id43$$gende.display,
-              contact: JSON.stringify(_ === 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$$telec = _$patient_id44$.telecom) === null || _$patient_id44$$telec === void 0 ? void 0 : (_$patient_id44$$telec2 = _$patient_id44$$telec[0]) === null || _$patient_id44$$telec2 === void 0 ? void 0 : _$patient_id44$$telec2.value),
-              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId64 = _.appointmentId) === null || _$appointmentId64 === void 0 ? void 0 : (_$appointmentId64$ = _$appointmentId64[0]) === null || _$appointmentId64$ === void 0 ? void 0 : _$appointmentId64$.appno,
-              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : _$appointmentId65$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : _$appointmentId66$.start, "DD MMM,YYYY") : "",
-              time: (_ === 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, "hh:mm A") : "",
+              // img: _?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid
+              //   ? getImgUrl(_?.appointmentId?.[0]?.PersonID?.[0]?.photo[0]?.fileid)
+              //   : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id48 = _.patient_id) === null || _$patient_id48 === void 0 ? void 0 : (_$patient_id48$ = _$patient_id48[0]) === null || _$patient_id48$ === void 0 ? void 0 : (_$patient_id48$$name = _$patient_id48$.name) === null || _$patient_id48$$name === void 0 ? void 0 : _$patient_id48$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id49 = _.patient_id) === null || _$patient_id49 === void 0 ? void 0 : (_$patient_id49$ = _$patient_id49[0]) === null || _$patient_id49$ === void 0 ? void 0 : _$patient_id49$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id50 = _.patient_id) === null || _$patient_id50 === void 0 ? void 0 : (_$patient_id50$ = _$patient_id50[0]) === null || _$patient_id50$ === void 0 ? void 0 : _$patient_id50$.age,
+              gender: _ === null || _ === void 0 ? void 0 : (_$patient_id51 = _.patient_id) === null || _$patient_id51 === void 0 ? void 0 : (_$patient_id51$ = _$patient_id51[0]) === null || _$patient_id51$ === void 0 ? void 0 : (_$patient_id51$$gende = _$patient_id51$.gender) === null || _$patient_id51$$gende === void 0 ? void 0 : _$patient_id51$$gende.display,
+              contact: JSON.stringify(_ === 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$$telec = _$patient_id52$.telecom) === null || _$patient_id52$$telec === void 0 ? void 0 : (_$patient_id52$$telec2 = _$patient_id52$$telec[0]) === null || _$patient_id52$$telec2 === void 0 ? void 0 : _$patient_id52$$telec2.value),
+              refNo: _ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.appno,
+              date: (_ === 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, "DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : _$appointmentId55$.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : _$appointmentId56$.start, "hh:mm A") : "",
               visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
-              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId69 = _.appointmentId) === null || _$appointmentId69 === void 0 ? void 0 : (_$appointmentId69$ = _$appointmentId69[0]) === null || _$appointmentId69$ === void 0 ? void 0 : (_$appointmentId69$$Sp = _$appointmentId69$.SpecialtyID) === null || _$appointmentId69$$Sp === void 0 ? void 0 : _$appointmentId69$$Sp.map(function (spl) {
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : (_$appointmentId57$$Sp = _$appointmentId57$.SpecialtyID) === null || _$appointmentId57$$Sp === void 0 ? void 0 : _$appointmentId57$$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;
               }).join(", "),
               clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail18 = _.practitioner_details) === null || _$practitioner_detail18 === void 0 ? void 0 : (_$practitioner_detail19 = _$practitioner_detail18[0]) === null || _$practitioner_detail19 === void 0 ? void 0 : _$practitioner_detail19.clinic) || "",
               encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status9 = _.status) === null || _$status9 === void 0 ? void 0 : _$status9.display,
-              "View Patient": true,
-              Attend: true
+              // "View Patient": true,
+              // Attend: true,
+              action: true
             };
           }) : [];
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {