primarycare-binder 1.1.11 → 1.1.15

package/dist/index.cjs.js

@@ -8016,7 +8016,7 @@ var query_ids = {
         "db_name": dbName,
         "entity": "Schedule",
         "filter": "Schedule.start >= ".concat(start, " AND Schedule.end <= ").concat(end, " AND Schedule.activestatus == true AND DOCUMENT(Schedule.resourceCode).id == ").concat(id),
-        "return_fields": "MERGE(Schedule, {slots : (FOR slt IN Slot FILTER Schedule.id IN slt.ScheduleID AND slt.status!='blocked' AND slt.start >= ".concat(moment().unix(), " AND slt.activestatus==true sort slt._id asc RETURN slt)})")
+        "return_fields": "MERGE(Schedule, {slots : (FOR slt IN Slot FILTER Schedule.id IN slt.ScheduleID AND slt.status!='blocked' AND slt.start >= ".concat(moment().unix(), " AND slt.activestatus==true sort slt._id asc RETURN merge(slt, {DayType: Document(slt.DayType)}))})")
       };
     } // query: ({ start, end, id }) => ({
     //   "db_name": dbName,
@@ -8084,7 +8084,7 @@ var queries$a = {
         Encounter: "Encounter.appointmentId == [".concat(appointmentId, "]"),
         Patient: "Patient.id == Encounter.patient_id"
       },
-      "return_fields": "merge(Encounter,{patient_id:(for p in Patient.identifier return merge(Patient,{identifier:document(p),name:document(Patient.name),telecom:document(Patient.telecom),photo:document(Patient.photo),martialStatus:document(Patient.maritalstatus)}))})"
+      return_fields: "merge(Encounter,{statusexpand:document(Encounter.status),patient_id:(for p in Patient.identifier return merge(Patient,{identifier:document(p),name:document(Patient.name),telecom:document(Patient.telecom),photo:document(Patient.photo),martialStatus:document(Patient.maritalstatus)}))})"
     };
   },
   visitmodify: {
@@ -9534,6 +9534,141 @@ var getImgUrl = function getImgUrl(fileId) {
   return fileId ? "".concat(__imgdownloadBaseUrl__).concat(fileId) : "";
 };
 
+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);
+  };
+}();
+
 var _extraReducers$C;
 var __options$8 = {
   method: "POST",
@@ -10636,7 +10771,7 @@ var APPOINTMENT_UPDATE = createAsyncThunk("appointmentReducer/updateAppointment"
             break;
           }
 
-          throw new Error(data.error && (typeof data.error === "string" ? data.error : data.message));
+          throw new Error(data.error && (typeof data.error === "string" ? data.error : data.message || data.errorMessage));
 
         case 9:
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -13521,9 +13656,10 @@ var practitionerReducer$1 = practitionerReducer.reducer;
 
 var _extraReducers$x;
 
-var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+
+var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,
-      _ref2,
+      _ref3,
       rejectWithValue,
       date,
       startTime,
@@ -13538,15 +13674,16 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
       data,
       returnData,
       allLangs,
-      _args = arguments;
+      allCities,
+      _args2 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee$(_context) {
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
     while (1) {
-      switch (_context.prev = _context.next) {
+      switch (_context2.prev = _context2.next) {
         case 0:
-          payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
-          _context.prev = 2;
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref3 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref3.rejectWithValue;
+          _context2.prev = 2;
           date = new Date();
 
           if (payload.date) {
@@ -13597,15 +13734,16 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           // }
 
 
-          _context.next = 12;
+          _context2.next = 12;
           return fetchData$3({
             body: JSON.stringify(body)
           });
 
         case 12:
-          data = _context.sent;
+          data = _context2.sent;
           returnData = [];
           allLangs = new Set();
+          allCities = new Set();
 
           if (Array.isArray(data) && Array.isArray(data[0])) {
             data[0].forEach(function (record) {
@@ -13617,7 +13755,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     restData = _objectWithoutProperties(record, ["OrgType", "id", "_id", "displayresource"]);
 
                 if (displayresource) {
-                  var _OrgType$some, _restData$locationID, _restData$hospital2, _OrgType$, _restData$hospital3, _restData$hospital3$O, _restData$hospital4;
+                  var _OrgType$some, _restData$address, _restData$address$, _restData$hospital2, _restData$hospital2$a, _restData$hospital2$a2, _restData$locationID, _restData$hospital3, _OrgType$, _restData$hospital4, _restData$hospital4$O, _restData$hospital5;
 
                   var resourceInfo = {
                     resourcetype: "",
@@ -13669,6 +13807,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                   //     isClinic,
                   // );
 
+                  var city = (restData === null || restData === void 0 ? void 0 : (_restData$address = restData.address) === null || _restData$address === void 0 ? void 0 : (_restData$address$ = _restData$address[0]) === null || _restData$address$ === void 0 ? void 0 : _restData$address$.city) || (restData === null || restData === void 0 ? void 0 : (_restData$hospital2 = restData.hospital) === null || _restData$hospital2 === void 0 ? void 0 : (_restData$hospital2$a = _restData$hospital2.address) === null || _restData$hospital2$a === void 0 ? void 0 : (_restData$hospital2$a2 = _restData$hospital2$a[0]) === null || _restData$hospital2$a2 === void 0 ? void 0 : _restData$hospital2$a2.city) || "";
+                  allCities.add(city);
                   var info = {
                     clinicId: (restData === null || restData === void 0 ? void 0 : (_restData$locationID = restData.locationID) === null || _restData$locationID === void 0 ? void 0 : _restData$locationID.id) || 0,
                     id: id,
@@ -13683,6 +13823,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     hospitalName: "",
                     hospitalLocation: "",
                     kms: "0 Kms",
+                    city: city,
                     weekCalendar: payload.date && payload.date * 1000 || Date.now(),
                     isAllSession: isClinic,
                     allSession: allSession,
@@ -13696,15 +13837,15 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     resourceInfo: resourceInfo,
                     specialities: [],
                     healthCareId: healthCareId,
-                    orgId: isClinic ? id : restData === null || restData === void 0 ? void 0 : (_restData$hospital2 = restData.hospital) === null || _restData$hospital2 === void 0 ? void 0 : _restData$hospital2.id,
-                    orgType: isClinic ? OrgType === null || OrgType === void 0 ? void 0 : (_OrgType$ = OrgType[0]) === null || _OrgType$ === void 0 ? void 0 : _OrgType$._id : restData === null || restData === void 0 ? void 0 : (_restData$hospital3 = restData.hospital) === null || _restData$hospital3 === void 0 ? void 0 : (_restData$hospital3$O = _restData$hospital3.OrgType) === null || _restData$hospital3$O === void 0 ? void 0 : _restData$hospital3$O[0],
-                    org_Id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : (_restData$hospital4 = restData.hospital) === null || _restData$hospital4 === void 0 ? void 0 : _restData$hospital4._id,
+                    orgId: isClinic ? id : restData === null || restData === void 0 ? void 0 : (_restData$hospital3 = restData.hospital) === null || _restData$hospital3 === void 0 ? void 0 : _restData$hospital3.id,
+                    orgType: isClinic ? OrgType === null || OrgType === void 0 ? void 0 : (_OrgType$ = OrgType[0]) === null || _OrgType$ === void 0 ? void 0 : _OrgType$._id : restData === null || restData === void 0 ? void 0 : (_restData$hospital4 = restData.hospital) === null || _restData$hospital4 === void 0 ? void 0 : (_restData$hospital4$O = _restData$hospital4.OrgType) === null || _restData$hospital4$O === void 0 ? void 0 : _restData$hospital4$O[0],
+                    org_Id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : (_restData$hospital5 = restData.hospital) === null || _restData$hospital5 === void 0 ? void 0 : _restData$hospital5._id,
                     _id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : restData._id,
                     _key: restData === null || restData === void 0 ? void 0 : restData._key
                   };
 
                   if (isClinic) {
-                    var _restData$clinics5, _restData$clinics5$, _s$Type, _restData$locationID2, _restData$address, _restData$address$, _restData$address2, _restData$address2$, _restData$Practitione, _restData$address3, _restData$address3$, _restData$locationID3, _restData$locationID4, _restData$locationID5;
+                    var _restData$clinics5, _restData$clinics5$, _s$Type, _restData$locationID2, _restData$address2, _restData$address2$, _restData$address3, _restData$address3$, _restData$Practitione, _restData$address4, _restData$address4$, _restData$locationID3, _restData$locationID4, _restData$locationID5;
 
                     var s = restData === null || restData === void 0 ? void 0 : (_restData$clinics5 = restData.clinics) === null || _restData$clinics5 === void 0 ? void 0 : (_restData$clinics5$ = _restData$clinics5[0]) === null || _restData$clinics5$ === void 0 ? void 0 : _restData$clinics5$.Specialties;
 
@@ -13725,8 +13866,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
 
                     info["name"] = (restData === null || restData === void 0 ? void 0 : (_restData$locationID2 = restData.locationID) === null || _restData$locationID2 === void 0 ? void 0 : _restData$locationID2.shortdesc) || "";
                     info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : restData.name) || "";
-                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address = restData.address) === null || _restData$address === void 0 ? void 0 : (_restData$address$ = _restData$address[0]) === null || _restData$address$ === void 0 ? void 0 : _restData$address$.line) || "";
-                    info["title"] = (restData === null || restData === void 0 ? void 0 : (_restData$address2 = restData.address) === null || _restData$address2 === void 0 ? void 0 : (_restData$address2$ = _restData$address2[0]) === null || _restData$address2$ === void 0 ? void 0 : _restData$address2$.line) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address2 = restData.address) === null || _restData$address2 === void 0 ? void 0 : (_restData$address2$ = _restData$address2[0]) === null || _restData$address2$ === void 0 ? void 0 : _restData$address2$.line) || "";
+                    info["title"] = (restData === null || restData === void 0 ? void 0 : (_restData$address3 = restData.address) === null || _restData$address3 === void 0 ? void 0 : (_restData$address3$ = _restData$address3[0]) === null || _restData$address3$ === void 0 ? void 0 : _restData$address3$.line) || "";
                     info["gender"] = null;
                     info["memberIncludes"] = restData === null || restData === void 0 ? void 0 : restData.member_count;
                     info["memberIncludesImg"] = restData === null || restData === void 0 ? void 0 : (_restData$Practitione = restData.Practitioner) === null || _restData$Practitione === void 0 ? void 0 : _restData$Practitione.map(function (p) {
@@ -13738,11 +13879,11 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
 
                       return "";
                     });
-                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address3 = restData.address) === null || _restData$address3 === void 0 ? void 0 : (_restData$address3$ = _restData$address3[0]) === null || _restData$address3$ === void 0 ? void 0 : _restData$address3$.distance) ? "".concat(restData.address[0].distance) : "0";
+                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address4 = restData.address) === null || _restData$address4 === void 0 ? void 0 : (_restData$address4$ = _restData$address4[0]) === null || _restData$address4$ === void 0 ? void 0 : _restData$address4$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$locationID3 = restData.locationID) === null || _restData$locationID3 === void 0 ? void 0 : (_restData$locationID4 = _restData$locationID3.photo) === null || _restData$locationID4 === void 0 ? void 0 : (_restData$locationID5 = _restData$locationID4[0]) === null || _restData$locationID5 === void 0 ? void 0 : _restData$locationID5.fileid);
                   } else {
-                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital5, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital6, _restData$address4, _restData$address4$, _restData$name, _restData$photo, _restData$photo$, _restData$address5, _restData$address5$;
+                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital6, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital7, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$;
 
                     var 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) || "";
                     var designation = "";
@@ -13782,17 +13923,17 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     });
                     info["title"] = "".concat(gender).concat(gender && " | ").concat(designation);
                     info["gender"] = gender;
-                    info["hospId"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital5 = restData.hospital) === null || _restData$hospital5 === void 0 ? void 0 : _restData$hospital5.id;
+                    info["hospId"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : _restData$hospital6.id;
                     info["subtext"] = (restData === null || restData === void 0 ? void 0 : (_restData$qualificati = restData.qualification) === null || _restData$qualificati === void 0 ? void 0 : (_restData$qualificati2 = _restData$qualificati.map) === null || _restData$qualificati2 === void 0 ? void 0 : (_restData$qualificati3 = _restData$qualificati2.call(_restData$qualificati, function (q) {
                       return (q === null || q === void 0 ? void 0 : q.name) || "";
                     })) === null || _restData$qualificati3 === void 0 ? void 0 : _restData$qualificati3.join(", ")) || "MBBS";
                     info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
-                    info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : _restData$hospital6.name) || "";
-                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address4 = restData.address) === null || _restData$address4 === void 0 ? void 0 : (_restData$address4$ = _restData$address4[0]) === null || _restData$address4$ === void 0 ? void 0 : _restData$address4$.line) || "";
+                    info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital7 = restData.hospital) === null || _restData$hospital7 === void 0 ? void 0 : _restData$hospital7.name) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.line) || "";
                     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$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["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address6 = restData.address) === null || _restData$address6 === void 0 ? void 0 : (_restData$address6$ = _restData$address6[0]) === null || _restData$address6$ === void 0 ? void 0 : _restData$address6$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                   }
 
@@ -13800,27 +13941,39 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                 }
               }
             });
-          }
+          } // const {
+          //     lat: myLat,
+          //     long: myLong,
+          // } = getCurrentPosition();
+          // const locationInfo = {};
+          // if (myLat && myLong) {
+          //     const promArr = [...allCities].map(city => getLocationInfo({lat: myLat, long: myLong}, city, locationInfo));
+          //     await Promise.all(promArr);
+          //     returnData.forEach(d => {
+          //         d.kms = locationInfo[d.city] || "0 Kms";
+          //     })
+          // }
 
-          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData,
             allLangs: _toConsumableArray(allLangs)
           }));
 
-        case 19:
-          _context.prev = 19;
-          _context.t0 = _context["catch"](2);
-          console.log(_context.t0);
-          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context.t0.message
+        case 20:
+          _context2.prev = 20;
+          _context2.t0 = _context2["catch"](2);
+          console.log(_context2.t0);
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context2.t0.message
           })));
 
-        case 23:
+        case 24:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
     }
-  }, _callee, null, [[2, 19]]);
+  }, _callee2, null, [[2, 20]]);
 }))); // end
 // FUZZY SEARCH CREATE INITIALSTATE
 
@@ -14105,6 +14258,9 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
       location,
       body,
       data,
+      _yield$getCurrentPosi,
+      lat,
+      _long,
       returnData,
       _args4 = arguments;
 
@@ -14115,7 +14271,7 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
           payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
           _context4.prev = 2;
-          _payload$city2 = payload.city, city = _payload$city2 === void 0 ? "" : _payload$city2, _payload$location = payload.location, location = _payload$location === void 0 ? "" : _payload$location;
+          _payload$city2 = payload.city, city = _payload$city2 === void 0 ? "" : _payload$city2, _payload$location = payload.location, location = _payload$location === void 0 ? {} : _payload$location;
           body = {
             db_name: dbName,
             queryid: query_ids["searhcApiSlice/getHospitals"],
@@ -14133,6 +14289,13 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
 
         case 7:
           data = _context4.sent;
+          _context4.next = 10;
+          return getCurrentPosition();
+
+        case 10:
+          _yield$getCurrentPosi = _context4.sent;
+          lat = _yield$getCurrentPosi.lat;
+          _long = _yield$getCurrentPosi["long"];
           returnData = [];
 
           if (Array.isArray(data)) {
@@ -14140,11 +14303,18 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
               if (hospInfo.id && hospInfo.name) {
                 var _hospInfo$address, _hospInfo$address2;
 
+                var distance = "";
+
+                if (lat && _long) {
+                  distance = getDisctanceFromLatLonInKm(lat, _long, location.latitude, location.longitude) + " KM";
+                }
+
                 returnData.push({
                   value: hospInfo.id,
                   label: hospInfo.name,
                   lat: hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address = hospInfo.address) === null || _hospInfo$address === void 0 ? void 0 : _hospInfo$address.latitude,
-                  "long": hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address2 = hospInfo.address) === null || _hospInfo$address2 === void 0 ? void 0 : _hospInfo$address2.longitude
+                  "long": hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address2 = hospInfo.address) === null || _hospInfo$address2 === void 0 ? void 0 : _hospInfo$address2.longitude,
+                  distance: distance
                 });
               }
             });
@@ -14154,19 +14324,19 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
             data: returnData
           }));
 
-        case 13:
-          _context4.prev = 13;
+        case 18:
+          _context4.prev = 18;
           _context4.t0 = _context4["catch"](2);
           return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context4.t0.message
           })));
 
-        case 16:
+        case 21:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[2, 13]]);
+  }, _callee4, null, [[2, 18]]);
 })));
 var GET_SYMPTOMS = createAsyncThunk("searhcApiSlice/getSymptoms", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
   var payload,
@@ -14552,26 +14722,82 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
     }
   }, _callee10, null, [[2, 12]]);
 })));
-var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practitionerAgainstOrganization", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+
+var getLocationInfo = /*#__PURE__*/function () {
+  var _ref21 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+    var _hospInfo$address3, _hospInfo$address3$, _hospInfo$address3$$c;
+
+    var hospInfo,
+        obj,
+        city,
+        info,
+        _args11 = arguments;
+    return regeneratorRuntime.wrap(function _callee11$(_context11) {
+      while (1) {
+        switch (_context11.prev = _context11.next) {
+          case 0:
+            hospInfo = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
+            obj = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
+            city = hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address3 = hospInfo.address) === null || _hospInfo$address3 === void 0 ? void 0 : (_hospInfo$address3$ = _hospInfo$address3[0]) === null || _hospInfo$address3$ === void 0 ? void 0 : (_hospInfo$address3$$c = _hospInfo$address3$.city) === null || _hospInfo$address3$$c === void 0 ? void 0 : _hospInfo$address3$$c.geogLevelName;
+
+            if (obj[city]) {
+              _context11.next = 8;
+              break;
+            }
+
+            _context11.next = 6;
+            return getLatLong(city);
+
+          case 6:
+            info = _context11.sent;
+            obj[city] = info;
+
+          case 8:
+          case "end":
+            return _context11.stop();
+        }
+      }
+    }, _callee11);
+  }));
+
+  return function getLocationInfo() {
+    return _ref21.apply(this, arguments);
+  };
+}();
+
+var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practitionerAgainstOrganization", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
-      _ref22,
+      _ref23,
       rejectWithValue,
       _payload$practitioner,
       practitionerId,
+      _yield$getCurrentPosi2,
+      myLat,
+      myLong,
       body,
       data,
       returnData,
       _data$result,
-      _args11 = arguments;
+      _data$result2,
+      cityMap,
+      promArr,
+      _args12 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee11$(_context11) {
+  return regeneratorRuntime.wrap(function _callee12$(_context12) {
     while (1) {
-      switch (_context11.prev = _context11.next) {
+      switch (_context12.prev = _context12.next) {
         case 0:
-          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
-          _ref22 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref22.rejectWithValue;
-          _context11.prev = 2;
+          payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+          _ref23 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref23.rejectWithValue;
+          _context12.prev = 2;
           _payload$practitioner = payload.practitionerId, practitionerId = _payload$practitioner === void 0 ? "" : _payload$practitioner;
+          _context12.next = 6;
+          return getCurrentPosition();
+
+        case 6:
+          _yield$getCurrentPosi2 = _context12.sent;
+          myLat = _yield$getCurrentPosi2.lat;
+          myLong = _yield$getCurrentPosi2["long"];
           body = {
             db_name: dbName,
             entity: "Practitioner,Organization",
@@ -14579,45 +14805,72 @@ var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practit
               Practitioner: "Practitioner.id==".concat(practitionerId),
               Organization: "document(Practitioner.practitioner_role)[*].OrgID any == Organization._id"
             },
-            return_fields: "{OrganizationName:Organization.name, OrgID:Organization.id}"
+            return_fields: "{address: (let add = Document(Organization.address[0]) return merge(add, { city: Document(add.city) })), OrganizationName:Organization.name, OrgID:Organization.id}"
           };
-          _context11.next = 7;
+          _context12.next = 12;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
-        case 7:
-          data = _context11.sent;
+        case 12:
+          data = _context12.sent;
           returnData = [];
 
-          if (Array.isArray(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.forEach(function (hospInfo) {
-              returnData.push({
-                value: hospInfo.OrgID,
-                label: hospInfo.OrganizationName,
-                lat: 0,
-                "long": 0
-              });
-            });
+          if (!Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
+            _context12.next = 20;
+            break;
           }
 
-          return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          cityMap = {};
+          promArr = data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (hospInfo) {
+            return getLocationInfo(hospInfo, cityMap);
+          });
+          _context12.next = 19;
+          return es6Promise.Promise.all(promArr);
+
+        case 19:
+          data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : _data$result2.forEach(function (hospInfo) {
+            var _hospInfo$address4, _hospInfo$address4$, _hospInfo$address4$$c;
+
+            var city = hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address4 = hospInfo.address) === null || _hospInfo$address4 === void 0 ? void 0 : (_hospInfo$address4$ = _hospInfo$address4[0]) === null || _hospInfo$address4$ === void 0 ? void 0 : (_hospInfo$address4$$c = _hospInfo$address4$.city) === null || _hospInfo$address4$$c === void 0 ? void 0 : _hospInfo$address4$$c.geogLevelName;
+
+            var _ref24 = cityMap[city] || {},
+                lat = _ref24.lat,
+                _long2 = _ref24["long"];
+
+            var distance = "";
+
+            if (myLat && myLong && lat && _long2) {
+              distance = getDisctanceFromLatLonInKm(lat, _long2, myLat, myLong) + " KM";
+            }
+
+            returnData.push({
+              value: hospInfo.OrgID,
+              label: hospInfo.OrganizationName,
+              lat: 0,
+              "long": 0,
+              distance: distance
+            });
+          });
+
+        case 20:
+          return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
-        case 13:
-          _context11.prev = 13;
-          _context11.t0 = _context11["catch"](2);
-          return _context11.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context11.t0.message
+        case 23:
+          _context12.prev = 23;
+          _context12.t0 = _context12["catch"](2);
+          return _context12.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context12.t0.message
           })));
 
-        case 16:
+        case 26:
         case "end":
-          return _context11.stop();
+          return _context12.stop();
       }
     }
-  }, _callee11, null, [[2, 13]]);
+  }, _callee12, null, [[2, 23]]);
 })));
 var searhcApiSlice = createSlice({
   name: "searhcApiSlice",
@@ -18302,7 +18555,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           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 && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='checked-in'")
+          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)}))})}"
       },
@@ -18311,7 +18564,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           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 && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='checked-in'")
+          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)}))})}"
       }
@@ -18323,13 +18576,13 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner",
         filter: "Practitioner.activestatus==true && document(Practitioner.practitioner_role)[*].role any =='".concat(role, "'&& Practitioner.practitioner_type=='").concat(type, "'"),
-        return_fields: "merge(keep(Practitioner,'name','id','_id','_key','practitioner_role','photo'),{name:(for hnm in HumanNameMaster filter hnm._id in Practitioner.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_role:document(Practitioner.practitioner_role)},{photo:document(Practitioner.photo), assignedpatient:LENGTH(FOR Appointment IN Appointment FILTER Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end, " && Appointment.practitionerID[*] any==Practitioner.id Return Appointment)})")
+        return_fields: "merge(keep(Practitioner,'name','id','_id','_key','practitioner_role','photo'),{name:(for hnm in HumanNameMaster filter hnm._id in Practitioner.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_role:(for pracrr in PractitionerRole filter pracrr._id in Practitioner.practitioner_role return merge(pracrr,{role:(for cod in CodeableConceptMaster filter cod._id==pracrr.role return document(cod.coding))}))},{photo:document(Practitioner.photo), assignedpatient:LENGTH(FOR Encounter IN Encounter FILTER Encounter.activestatus==true && Encounter.encounterdate>=".concat(start, " && Encounter.encounterdate<=").concat(end, " && Encounter.participant[*].Practitioner_id any == document(Practitioner._id).id return Encounter)})")
       },
       reassign: {
         db_name: dbName,
         entity: "Practitioner",
         filter: "Practitioner.activestatus==true && document(Practitioner.practitioner_role)[*].role any =='".concat(role, "'&& Practitioner.practitioner_type=='").concat(type, "'"),
-        return_fields: "merge(keep(Practitioner,'name','id','_id','_key','practitioner_role','photo'),{name:(for hnm in HumanNameMaster filter hnm._id in Practitioner.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_role:document(Practitioner.practitioner_role)},{photo:document(Practitioner.photo), assignedpatient:LENGTH(FOR Appointment IN Appointment FILTER Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end, " && Appointment.practitionerID[*] any==Practitioner.id Return Appointment)})")
+        return_fields: "merge(keep(Practitioner,'name','id','_id','_key','practitioner_role','photo'),{name:(for hnm in HumanNameMaster filter hnm._id in Practitioner.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_role:(for pracrr in PractitionerRole filter pracrr._id in Practitioner.practitioner_role return merge(pracrr,{role:(for cod in CodeableConceptMaster filter cod._id==pracrr.role return document(cod.coding))}))},{photo:document(Practitioner.photo), assignedpatient:LENGTH(FOR Encounter IN Encounter FILTER Encounter.activestatus==true && Encounter.encounterdate>=".concat(start, " && Encounter.encounterdate<=").concat(end, " && Encounter.participant[*].Practitioner_id any == document(Practitioner._id).id return Encounter)})")
       }
     };
   },
@@ -18431,10 +18684,10 @@ var visitQuery = {
     return {
       1: {
         db_name: dbName,
-        entity: "Practitioner,Encounter",
+        entity: "Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' collect with count into length")
+          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orGId, "' "),
+          Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' collect with count into length"
         },
         return_fields: "{CheckedIn:length}"
       },
@@ -18459,10 +18712,10 @@ var visitQuery = {
     return {
       1: {
         db_name: dbName,
-        entity: "Practitioner,Encounter",
+        entity: "Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>=").concat(startDate, "  && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Triaged' collect with count into length")
+          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orGId, "' "),
+          Encounter: "Appointment.id in Encounter.appointmentId &&  DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Triaged' collect with count into length"
         },
         return_fields: "{TriagedCount:length}"
       },
@@ -18487,10 +18740,10 @@ var visitQuery = {
     return {
       1: {
         db_name: "primarycare",
-        entity: "Practitioner,Encounter",
+        entity: "Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id ==".concat(orgId, "  && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
+          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orGId, "' "),
+          Encounter: "Appointment.id in Encounter.appointmentId && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length"
         },
         return_fields: "{CompletedCount:length}"
       },
@@ -18561,7 +18814,7 @@ var highPriorityPatientQuery = {
       1: {
         db_name: "primarycare",
         entity: "Encounter",
-        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high'"),
+        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high' AND (lower(DOCUMENT(Encounter.status).display)==lower('Triaged') or lower(DOCUMENT(Encounter.status).display)==lower('In-progress'))"),
         return_fields: "MERGE(Encounter,{patient_id:(FOR pat IN Patient FILTER pat.id==Encounter.patient_id RETURN MERGE(pat,{name:(FOR hn IN TO_ARRAY(pat.name) RETURN DOCUMENT(hn)),photo:(FOR ph IN TO_ARRAY(pat.photo) RETURN DOCUMENT(ph))})),priority:DOCUMENT(Encounter.priority),priorityreason:DOCUMENT(Encounter.priorityreason)},{appointmentId:(for app in Appointment filter app.id in Encounter.appointmentId return app)},{reasonReference:document(Encounter.reasonReference)})"
       },
       2: {
@@ -18698,12 +18951,15 @@ var TODAY_SCHEDULE = createAsyncThunk("dashboardApiSlice/today_schedul", /*#__PU
                 return arr.push({
                   title: (_task$Appointment$0$c = task === null || task === void 0 ? void 0 : (_task$Appointment = task.Appointment) === null || _task$Appointment === void 0 ? void 0 : (_task$Appointment$ = _task$Appointment[0]) === null || _task$Appointment$ === void 0 ? void 0 : _task$Appointment$.consultationMode) !== null && _task$Appointment$0$c !== void 0 ? _task$Appointment$0$c : "",
                   status: (task === null || task === void 0 ? void 0 : task.Appointment.length) > 0 ? false : true,
-                  timefrom: (_task$start = task === null || task === void 0 ? void 0 : task.start) !== null && _task$start !== void 0 ? _task$start : "",
-                  timeto: (_task$end = task === null || task === void 0 ? void 0 : task.end) !== null && _task$end !== void 0 ? _task$end : "",
+                  timefrom: (_task$start = task === null || task === void 0 ? void 0 : task.start) !== null && _task$start !== void 0 ? _task$start : 0,
+                  timeto: (_task$end = task === null || task === void 0 ? void 0 : task.end) !== null && _task$end !== void 0 ? _task$end : 0,
                   type: (_task$Type = task === null || task === void 0 ? void 0 : task.Type) !== null && _task$Type !== void 0 ? _task$Type : ""
                 });
               });
             });
+            arr.sort(function (a, b) {
+              return Number(a.timefrom) - Number(b.timefrom);
+            });
           }
 
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -19053,7 +19309,7 @@ var TODAY_VISIT = createAsyncThunk("dashboardApiSlice/today_visit", /*#__PURE__*
           orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgIdInt = payload.orgIdInt;
           _context9.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgIdInt, loginId)[roleId])
+            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgIdInt, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
@@ -20602,12 +20858,12 @@ var VISIT_CHECKEDIN = createAsyncThunk("visitStatsApiSlice/visitCheckedin", /*#_
       rejectWithValue,
       _data$result$0$Checke,
       _data$result$,
-      orgId,
+      orgIdInt,
       startDate,
       endDate,
       roleId,
       loginId,
-      org_id,
+      orgId,
       data,
       _args = arguments;
 
@@ -20618,10 +20874,10 @@ var VISIT_CHECKEDIN = createAsyncThunk("visitStatsApiSlice/visitCheckedin", /*#_
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, org_id = payload.org_id;
+          orgIdInt = payload.orgIdInt, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgId = payload.orgId;
           _context.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgId, loginId, org_id)[roleId])
+            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgIdInt, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
@@ -20650,14 +20906,14 @@ var VISIT_TRAIGE_DONE = createAsyncThunk("visitStatsApiSlice/visitTraigeCount",
   var payload,
       _ref4,
       rejectWithValue,
-      _data$0$result$Triage,
-      _data$,
-      _data$$result,
-      orgId,
+      _data$result$0$Triage,
+      _data$result$2,
+      orgIdInt,
       startDate,
       endDate,
       roleId,
       loginId,
+      orgId,
       data,
       _args2 = arguments;
 
@@ -20668,17 +20924,17 @@ var VISIT_TRAIGE_DONE = createAsyncThunk("visitStatsApiSlice/visitTraigeCount",
           payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
           _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
           _context2.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId;
+          orgIdInt = payload.orgIdInt, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgId = payload.orgId;
           _context2.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.traigeDone(orgId, startDate, endDate, loginId)[roleId])
+            body: JSON.stringify(visitQuery.traigeDone(startDate, endDate, orgIdInt, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
           data = _context2.sent;
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
-              count: (_data$0$result$Triage = (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$result = _data$.result) === null || _data$$result === void 0 ? void 0 : _data$$result.TriagedCount) !== null && _data$0$result$Triage !== void 0 ? _data$0$result$Triage : 0
+              count: (_data$result$0$Triage = data === null || data === void 0 ? void 0 : (_data$result$2 = data.result[0]) === null || _data$result$2 === void 0 ? void 0 : _data$result$2.TriagedCount) !== null && _data$result$0$Triage !== void 0 ? _data$result$0$Triage : 0
             }
           }));
 
@@ -20700,14 +20956,14 @@ var VISIT_COMPLETED = createAsyncThunk("visitStatsApiSlice/visitCompletedCount",
   var payload,
       _ref6,
       rejectWithValue,
-      _data$0$result$Comple,
-      _data$2,
-      _data$2$result,
-      orgId,
+      _data$result$0$Comple,
+      _data$result$3,
+      orgIdInt,
       startDate,
       endDate,
       roleId,
       loginId,
+      orgId,
       data,
       _args3 = arguments;
 
@@ -20718,17 +20974,17 @@ var VISIT_COMPLETED = createAsyncThunk("visitStatsApiSlice/visitCompletedCount",
           payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
           _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
           _context3.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId;
+          orgIdInt = payload.orgIdInt, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgId = payload.orgId;
           _context3.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.visitCompleted(orgId, startDate, endDate, loginId)[roleId])
+            body: JSON.stringify(visitQuery.visitCompleted(startDate, endDate, orgIdInt, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
           data = _context3.sent;
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
-              count: (_data$0$result$Comple = (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$result = _data$2.result) === null || _data$2$result === void 0 ? void 0 : _data$2$result.CompletedCount) !== null && _data$0$result$Comple !== void 0 ? _data$0$result$Comple : 0
+              count: (_data$result$0$Comple = data === null || data === void 0 ? void 0 : (_data$result$3 = data.result[0]) === null || _data$result$3 === void 0 ? void 0 : _data$result$3.CompletedCount) !== null && _data$result$0$Comple !== void 0 ? _data$result$0$Comple : 0
             }
           }));
 
@@ -20750,14 +21006,14 @@ var VISIT_NO_SHOWS = createAsyncThunk("visitStatsApiSlice/visitNoShowCount", /*#
   var payload,
       _ref8,
       rejectWithValue,
-      _data$0$result$NoShow,
-      _data$3,
-      _data$3$result,
-      orgId,
+      _data$result$0$NoShow,
+      _data$result$4,
+      orgIdInt,
       startDate,
       endDate,
       roleId,
       loginId,
+      orgId,
       data,
       _args4 = arguments;
 
@@ -20768,17 +21024,17 @@ var VISIT_NO_SHOWS = createAsyncThunk("visitStatsApiSlice/visitNoShowCount", /*#
           payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
           _context4.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId;
+          orgIdInt = payload.orgIdInt, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgId = payload.orgId;
           _context4.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.noShows(orgId, startDate, endDate, loginId)[roleId])
+            body: JSON.stringify(visitQuery.noShows(startDate, endDate, orgIdInt, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
           data = _context4.sent;
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
-              count: (_data$0$result$NoShow = (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$result = _data$3.result) === null || _data$3$result === void 0 ? void 0 : _data$3$result.NoShowCount) !== null && _data$0$result$NoShow !== void 0 ? _data$0$result$NoShow : 0
+              count: (_data$result$0$NoShow = data === null || data === void 0 ? void 0 : (_data$result$4 = data.result[0]) === null || _data$result$4 === void 0 ? void 0 : _data$result$4.NoShowCount) !== null && _data$result$0$NoShow !== void 0 ? _data$result$0$NoShow : 0
             }
           }));
 
@@ -20801,7 +21057,7 @@ var GET_VISIT_STATS = createAsyncThunk("visitStatsApiSlice/visitStatsCount", /*#
       _ref10,
       rejectWithValue,
       _data$result$0$Checke2,
-      _data$result$2,
+      _data$result$5,
       _data1$result$0$Triag,
       _data1$result,
       _data1$result$,
@@ -20861,7 +21117,7 @@ var GET_VISIT_STATS = createAsyncThunk("visitStatsApiSlice/visitStatsCount", /*#
           data3 = _context5.sent;
           return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
-              checkedIn: (_data$result$0$Checke2 = data === null || data === void 0 ? void 0 : (_data$result$2 = data.result[0]) === null || _data$result$2 === void 0 ? void 0 : _data$result$2.CheckedIn) !== null && _data$result$0$Checke2 !== void 0 ? _data$result$0$Checke2 : 0,
+              checkedIn: (_data$result$0$Checke2 = data === null || data === void 0 ? void 0 : (_data$result$5 = data.result[0]) === null || _data$result$5 === void 0 ? void 0 : _data$result$5.CheckedIn) !== null && _data$result$0$Checke2 !== void 0 ? _data$result$0$Checke2 : 0,
               traigeDone: (_data1$result$0$Triag = data1 === null || data1 === void 0 ? void 0 : (_data1$result = data1.result) === null || _data1$result === void 0 ? void 0 : (_data1$result$ = _data1$result[0]) === null || _data1$result$ === void 0 ? void 0 : _data1$result$.TriagedCount) !== null && _data1$result$0$Triag !== void 0 ? _data1$result$0$Triag : 0,
               visitCompleted: (_data2$result$0$Compl = data2 === null || data2 === void 0 ? void 0 : (_data2$result = data2.result) === null || _data2$result === void 0 ? void 0 : (_data2$result$ = _data2$result[0]) === null || _data2$result$ === void 0 ? void 0 : _data2$result$.CompletedCount) !== null && _data2$result$0$Compl !== void 0 ? _data2$result$0$Compl : 0,
               noShow: (_data3$result$0$NoSho = data3 === null || data3 === void 0 ? void 0 : (_data3$result = data3.result) === null || _data3$result === void 0 ? void 0 : (_data3$result$ = _data3$result[0]) === null || _data3$result$ === void 0 ? void 0 : _data3$result$.NoShowCount) !== null && _data3$result$0$NoSho !== void 0 ? _data3$result$0$NoSho : 0
@@ -37361,9 +37617,12 @@ var query$4 = {
   getAppointments: function getAppointments(data) {
     return {
       db_name: dbName,
-      entity: "Appointment",
-      filter: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
-      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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId"
+      },
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getFirstVisits: function getFirstVisits(data) {
@@ -37371,10 +37630,10 @@ var query$4 = {
       db_name: dbName,
       entity: "Appointment,Encounter",
       filter: {
-        "Appointment": "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
-        "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
       },
-      "return_fields": "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)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getOtherVisits: function getOtherVisits(data) {
@@ -37382,10 +37641,10 @@ var query$4 = {
       db_name: dbName,
       entity: "Appointment,Encounter",
       filter: {
-        "Appointment": "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
-        "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
       },
-      "return_fields": "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)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getWalkIns: function getWalkIns(data) {
@@ -37393,10 +37652,10 @@ var query$4 = {
       db_name: dbName,
       entity: "Appointment,Encounter",
       filter: {
-        "Appointment": "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
-        "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
       },
-      "return_fields": "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)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getNewPatients: function getNewPatients(data) {
@@ -37404,10 +37663,10 @@ var query$4 = {
       db_name: dbName,
       entity: "Appointment,Encounter",
       filter: {
-        "Appointment": "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
-        "Encounter": "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
       },
-      "return_fields": "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)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   getTodayVisits: function getTodayVisits(data) {
@@ -37418,46 +37677,147 @@ var query$4 = {
         Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
         Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' "
       },
-      return_fields: "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)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})"
+      return_fields: "{Appointment:merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}),Encounter:merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))})}"
     };
   },
   // NURSE
   getAppointmentsNurse: function getAppointmentsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\"\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Appointment,Encounter",
+      filter: {
+        Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
+        Encounter: "Appointment.id in Encounter.appointmentId"
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:document(document(Appointment.resourcecode).name)}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})),patient_id:(for pati in Patient filter pati.id == Encounter.patient_id return merge(pati,{name:document(pati.name)}))})"
+    };
   },
   getFirstVisitsNurse: function getFirstVisitsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\",\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Appointment,Encounter",
+      filter: {
+        Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:document(document(Appointment.resourcecode).name)}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})),patient_id:(for pati in Patient filter pati.id == Encounter.patient_id return merge(pati,{name:document(pati.name)}))})"
+    };
   },
   getNewPatientsNurse: function getNewPatientsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\",\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Appointment,Encounter",
+      filter: {
+        Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:document(document(Appointment.resourcecode).name)}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})),patient_id:(for pati in Patient filter pati.id == Encounter.patient_id return merge(pati,{name:document(pati.name)}))})"
+    };
   },
   getOtherVisitsNurse: function getOtherVisitsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\",\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Appointment,Encounter",
+      filter: {
+        Practitioner: "Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:document(document(Appointment.resourcecode).name)}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})),patient_id:(for pati in Patient filter pati.id == Encounter.patient_id return merge(pati,{name:document(pati.name)}))})"
+    };
   },
   getTodayVisitsNurse: function getTodayVisitsNurse(data) {
-    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Practitioner,Encounter\",\n          \"filter\": {\n            \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n            \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n            \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n          },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Encounter",
+      filter: {
+        Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(data === null || data === void 0 ? void 0 : data.orgIDInt, " &&  DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'")
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(for Appointment in Appointment filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getWalkInsNurse: function getWalkInsNurse(data) {
-    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\",\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Appointment,Encounter",
+      filter: {
+        Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
+      },
+      return_fields: "merge(Encounter,{status:document(Encounter.status),appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:document(document(Appointment.resourcecode).name)}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))})),patient_id:(for pati in Patient filter pati.id == Encounter.patient_id return merge(pati,{name:document(pati.name)}))})"
+    };
   },
   //Doctor
   getAppointmentsDoctor: function getAppointmentsDoctor(data) {
-    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Appointment\",\n          \"filter\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getFirstVisitsDoctor: function getFirstVisitsDoctor(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\"\n            }\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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getNewPatientsDoctor: function getNewPatientsDoctor(data) {
-    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\"\n            }\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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getOtherVisitsDoctor: function getOtherVisitsDoctor(data) {
-    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\"\n            }\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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getTodayVisitsDoctor: function getTodayVisitsDoctor(data) {
-    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\": {\n             \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, "\",\n              \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n            },\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)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, "  && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' "),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getWalkInsDoctor: function getWalkInsDoctor(data) {
-    return "\n        {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\"\n            }\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)}))},{gender:document(per.gender)})),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:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   }
 };
 
@@ -37487,20 +37847,24 @@ 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 _$PersonID, _$PersonID$, _$PersonID$$name, _$PersonID$$name$, _$SpecialtyID$0$text, _$SpecialtyID$, _$PersonID2, _$PersonID2$;
+            var _$Appointment, _$Appointment$PersonI, _$Appointment$PersonI2, _$Appointment$PersonI3, _$Appointment$PersonI4, _$Appointment2, _$Appointment2$Person, _$Appointment2$Person2, _$Appointment2$Person3, _$Appointment2$Person4, _$Encounter, _$Encounter$patient_i, _$Encounter$patient_i2, _$Encounter$patient_i3, _$Encounter2, _$Encounter2$patient_, _$Encounter2$patient_2, _$Appointment3, _$Appointment4, _$Appointment5, _$Appointment6, _$Appointment7, _$Appointment7$Specia, _$Encounter3, _$Encounter3$practiti, _$Encounter3$practiti2, _$Appointment8, _$Appointment8$Person, _$Appointment8$Person2, _$Encounter4, _$Encounter4$patient_, _$Encounter4$patient_2, _$Encounter4$patient_3, _$Encounter4$patient_4, _$Encounter5, _$Encounter6, _$Encounter6$status;
 
             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,
-              "mrn": 'MRN',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": (_$SpecialtyID$0$text = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$ = _.SpecialtyID[0]) === null || _$SpecialtyID$ === void 0 ? void 0 : _$SpecialtyID$.text) !== null && _$SpecialtyID$0$text !== void 0 ? _$SpecialtyID$0$text : "",
-              "clinic": 'Clinic',
-              "dob": _ === null || _ === void 0 ? void 0 : (_$PersonID2 = _.PersonID) === null || _$PersonID2 === void 0 ? void 0 : (_$PersonID2$ = _$PersonID2[0]) === null || _$PersonID2$ === void 0 ? void 0 : _$PersonID2$.birthDay,
-              "contact": 'Contact',
-              "visitType": _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment = _.Appointment) === null || _$Appointment === void 0 ? void 0 : (_$Appointment$PersonI = _$Appointment.PersonID) === null || _$Appointment$PersonI === void 0 ? void 0 : (_$Appointment$PersonI2 = _$Appointment$PersonI[0]) === null || _$Appointment$PersonI2 === void 0 ? void 0 : (_$Appointment$PersonI3 = _$Appointment$PersonI2.photo) === null || _$Appointment$PersonI3 === void 0 ? void 0 : (_$Appointment$PersonI4 = _$Appointment$PersonI3[0]) === null || _$Appointment$PersonI4 === void 0 ? void 0 : _$Appointment$PersonI4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment2 = _.Appointment) === null || _$Appointment2 === void 0 ? void 0 : (_$Appointment2$Person = _$Appointment2.PersonID) === null || _$Appointment2$Person === void 0 ? void 0 : (_$Appointment2$Person2 = _$Appointment2$Person[0]) === null || _$Appointment2$Person2 === void 0 ? void 0 : (_$Appointment2$Person3 = _$Appointment2$Person2.photo) === null || _$Appointment2$Person3 === void 0 ? void 0 : (_$Appointment2$Person4 = _$Appointment2$Person3[0]) === null || _$Appointment2$Person4 === void 0 ? void 0 : _$Appointment2$Person4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter = _.Encounter) === null || _$Encounter === void 0 ? void 0 : (_$Encounter$patient_i = _$Encounter.patient_id) === null || _$Encounter$patient_i === void 0 ? void 0 : (_$Encounter$patient_i2 = _$Encounter$patient_i[0]) === null || _$Encounter$patient_i2 === void 0 ? void 0 : (_$Encounter$patient_i3 = _$Encounter$patient_i2.name) === null || _$Encounter$patient_i3 === void 0 ? void 0 : _$Encounter$patient_i3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter2 = _.Encounter) === null || _$Encounter2 === void 0 ? void 0 : (_$Encounter2$patient_ = _$Encounter2.patient_id) === null || _$Encounter2$patient_ === void 0 ? void 0 : (_$Encounter2$patient_2 = _$Encounter2$patient_[0]) === null || _$Encounter2$patient_2 === void 0 ? void 0 : _$Encounter2$patient_2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment3 = _.Appointment) === null || _$Appointment3 === void 0 ? void 0 : _$Appointment3.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment4 = _.Appointment) === null || _$Appointment4 === void 0 ? void 0 : _$Appointment4.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment5 = _.Appointment) === null || _$Appointment5 === void 0 ? void 0 : _$Appointment5.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment6 = _.Appointment) === null || _$Appointment6 === void 0 ? void 0 : _$Appointment6.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment7 = _.Appointment) === null || _$Appointment7 === void 0 ? void 0 : (_$Appointment7$Specia = _$Appointment7.SpecialtyID) === null || _$Appointment7$Specia === void 0 ? void 0 : _$Appointment7$Specia.map(function (spl) {
+                var _spl$coding, _spl$coding$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding = spl.coding) === null || _spl$coding === void 0 ? void 0 : (_spl$coding$ = _spl$coding[0]) === null || _spl$coding$ === void 0 ? void 0 : _spl$coding$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter3 = _.Encounter) === null || _$Encounter3 === void 0 ? void 0 : (_$Encounter3$practiti = _$Encounter3.practitioner_details) === null || _$Encounter3$practiti === void 0 ? void 0 : (_$Encounter3$practiti2 = _$Encounter3$practiti[0]) === null || _$Encounter3$practiti2 === void 0 ? void 0 : _$Encounter3$practiti2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment8 = _.Appointment) === null || _$Appointment8 === void 0 ? void 0 : (_$Appointment8$Person = _$Appointment8.PersonID) === null || _$Appointment8$Person === void 0 ? void 0 : (_$Appointment8$Person2 = _$Appointment8$Person[0]) === null || _$Appointment8$Person2 === void 0 ? void 0 : _$Appointment8$Person2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter4 = _.Encounter) === null || _$Encounter4 === void 0 ? void 0 : (_$Encounter4$patient_ = _$Encounter4.patient_id) === null || _$Encounter4$patient_ === void 0 ? void 0 : (_$Encounter4$patient_2 = _$Encounter4$patient_[0]) === null || _$Encounter4$patient_2 === void 0 ? void 0 : (_$Encounter4$patient_3 = _$Encounter4$patient_2.telecom) === null || _$Encounter4$patient_3 === void 0 ? void 0 : (_$Encounter4$patient_4 = _$Encounter4$patient_3[0]) === null || _$Encounter4$patient_4 === void 0 ? void 0 : _$Encounter4$patient_4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter5 = _.Encounter) === null || _$Encounter5 === void 0 ? void 0 : _$Encounter5.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter6 = _.Encounter) === null || _$Encounter6 === void 0 ? void 0 : (_$Encounter6$status = _$Encounter6.status) === null || _$Encounter6$status === void 0 ? void 0 : _$Encounter6$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37549,20 +37913,24 @@ 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 _$PersonID3, _$PersonID3$, _$PersonID3$$name, _$PersonID3$$name$, _$SpecialtyID$0$text2, _$SpecialtyID$2, _$PersonID4, _$PersonID4$;
+            var _$Appointment9, _$Appointment9$Person, _$Appointment9$Person2, _$Appointment9$Person3, _$Appointment9$Person4, _$Appointment10, _$Appointment10$Perso, _$Appointment10$Perso2, _$Appointment10$Perso3, _$Appointment10$Perso4, _$Encounter7, _$Encounter7$patient_, _$Encounter7$patient_2, _$Encounter7$patient_3, _$Encounter8, _$Encounter8$patient_, _$Encounter8$patient_2, _$Appointment11, _$Appointment12, _$Appointment13, _$Appointment14, _$Appointment15, _$Appointment15$Speci, _$Encounter9, _$Encounter9$practiti, _$Encounter9$practiti2, _$Appointment16, _$Appointment16$Perso, _$Appointment16$Perso2, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Encounter10$patient3, _$Encounter10$patient4, _$Encounter11, _$Encounter12, _$Encounter12$status;
 
             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,
-              mrn: "MRN",
-              date: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("hh:mm A") : "",
-              speciality: (_$SpecialtyID$0$text2 = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$2 = _.SpecialtyID[0]) === null || _$SpecialtyID$2 === void 0 ? void 0 : _$SpecialtyID$2.text) !== null && _$SpecialtyID$0$text2 !== void 0 ? _$SpecialtyID$0$text2 : "",
-              clinic: "Clinic",
-              dob: _ === null || _ === void 0 ? void 0 : (_$PersonID4 = _.PersonID) === null || _$PersonID4 === void 0 ? void 0 : (_$PersonID4$ = _$PersonID4[0]) === null || _$PersonID4$ === void 0 ? void 0 : _$PersonID4$.birthDay,
-              contact: "Contact",
-              visitType: _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              appointmentStatus: "Status",
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment9 = _.Appointment) === null || _$Appointment9 === void 0 ? void 0 : (_$Appointment9$Person = _$Appointment9.PersonID) === null || _$Appointment9$Person === void 0 ? void 0 : (_$Appointment9$Person2 = _$Appointment9$Person[0]) === null || _$Appointment9$Person2 === void 0 ? void 0 : (_$Appointment9$Person3 = _$Appointment9$Person2.photo) === null || _$Appointment9$Person3 === void 0 ? void 0 : (_$Appointment9$Person4 = _$Appointment9$Person3[0]) === null || _$Appointment9$Person4 === void 0 ? void 0 : _$Appointment9$Person4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment10 = _.Appointment) === null || _$Appointment10 === void 0 ? void 0 : (_$Appointment10$Perso = _$Appointment10.PersonID) === null || _$Appointment10$Perso === void 0 ? void 0 : (_$Appointment10$Perso2 = _$Appointment10$Perso[0]) === null || _$Appointment10$Perso2 === void 0 ? void 0 : (_$Appointment10$Perso3 = _$Appointment10$Perso2.photo) === null || _$Appointment10$Perso3 === void 0 ? void 0 : (_$Appointment10$Perso4 = _$Appointment10$Perso3[0]) === null || _$Appointment10$Perso4 === void 0 ? void 0 : _$Appointment10$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter7 = _.Encounter) === null || _$Encounter7 === void 0 ? void 0 : (_$Encounter7$patient_ = _$Encounter7.patient_id) === null || _$Encounter7$patient_ === void 0 ? void 0 : (_$Encounter7$patient_2 = _$Encounter7$patient_[0]) === null || _$Encounter7$patient_2 === void 0 ? void 0 : (_$Encounter7$patient_3 = _$Encounter7$patient_2.name) === null || _$Encounter7$patient_3 === void 0 ? void 0 : _$Encounter7$patient_3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter8 = _.Encounter) === null || _$Encounter8 === void 0 ? void 0 : (_$Encounter8$patient_ = _$Encounter8.patient_id) === null || _$Encounter8$patient_ === void 0 ? void 0 : (_$Encounter8$patient_2 = _$Encounter8$patient_[0]) === null || _$Encounter8$patient_2 === void 0 ? void 0 : _$Encounter8$patient_2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment11 = _.Appointment) === null || _$Appointment11 === void 0 ? void 0 : _$Appointment11.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment12 = _.Appointment) === null || _$Appointment12 === void 0 ? void 0 : _$Appointment12.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment13 = _.Appointment) === null || _$Appointment13 === void 0 ? void 0 : _$Appointment13.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment14 = _.Appointment) === null || _$Appointment14 === void 0 ? void 0 : _$Appointment14.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment15 = _.Appointment) === null || _$Appointment15 === void 0 ? void 0 : (_$Appointment15$Speci = _$Appointment15.SpecialtyID) === null || _$Appointment15$Speci === void 0 ? void 0 : _$Appointment15$Speci.map(function (spl) {
+                var _spl$coding2, _spl$coding2$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding2 = spl.coding) === null || _spl$coding2 === void 0 ? void 0 : (_spl$coding2$ = _spl$coding2[0]) === null || _spl$coding2$ === void 0 ? void 0 : _spl$coding2$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter9 = _.Encounter) === null || _$Encounter9 === void 0 ? void 0 : (_$Encounter9$practiti = _$Encounter9.practitioner_details) === null || _$Encounter9$practiti === void 0 ? void 0 : (_$Encounter9$practiti2 = _$Encounter9$practiti[0]) === null || _$Encounter9$practiti2 === void 0 ? void 0 : _$Encounter9$practiti2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment16 = _.Appointment) === null || _$Appointment16 === void 0 ? void 0 : (_$Appointment16$Perso = _$Appointment16.PersonID) === null || _$Appointment16$Perso === void 0 ? void 0 : (_$Appointment16$Perso2 = _$Appointment16$Perso[0]) === null || _$Appointment16$Perso2 === void 0 ? void 0 : _$Appointment16$Perso2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter10 = _.Encounter) === null || _$Encounter10 === void 0 ? void 0 : (_$Encounter10$patient = _$Encounter10.patient_id) === null || _$Encounter10$patient === void 0 ? void 0 : (_$Encounter10$patient2 = _$Encounter10$patient[0]) === null || _$Encounter10$patient2 === void 0 ? void 0 : (_$Encounter10$patient3 = _$Encounter10$patient2.telecom) === null || _$Encounter10$patient3 === void 0 ? void 0 : (_$Encounter10$patient4 = _$Encounter10$patient3[0]) === null || _$Encounter10$patient4 === void 0 ? void 0 : _$Encounter10$patient4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : _$Encounter11.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$status = _$Encounter12.status) === null || _$Encounter12$status === void 0 ? void 0 : _$Encounter12$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37611,20 +37979,24 @@ 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 _$PersonID5, _$PersonID5$, _$PersonID5$$name, _$PersonID5$$name$, _$SpecialtyID$0$text3, _$SpecialtyID$3, _$PersonID6, _$PersonID6$;
+            var _$Appointment17, _$Appointment17$Perso, _$Appointment17$Perso2, _$Appointment17$Perso3, _$Appointment17$Perso4, _$Appointment18, _$Appointment18$Perso, _$Appointment18$Perso2, _$Appointment18$Perso3, _$Appointment18$Perso4, _$Encounter13, _$Encounter13$patient, _$Encounter13$patient2, _$Encounter13$patient3, _$Encounter14, _$Encounter14$patient, _$Encounter14$patient2, _$Appointment19, _$Appointment20, _$Appointment21, _$Appointment22, _$Appointment23, _$Appointment23$Speci, _$Encounter15, _$Encounter15$practit, _$Encounter15$practit2, _$Appointment24, _$Appointment24$Perso, _$Appointment24$Perso2, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2, _$Encounter16$patient3, _$Encounter16$patient4, _$Encounter17, _$Encounter18, _$Encounter18$status;
 
             return {
-              img: "https://www.fillmurray.com/640/360",
-              name: _ === null || _ === void 0 ? void 0 : (_$PersonID5 = _.PersonID) === null || _$PersonID5 === void 0 ? void 0 : (_$PersonID5$ = _$PersonID5[0]) === null || _$PersonID5$ === void 0 ? void 0 : (_$PersonID5$$name = _$PersonID5$.name) === null || _$PersonID5$$name === void 0 ? void 0 : (_$PersonID5$$name$ = _$PersonID5$$name[0]) === null || _$PersonID5$$name$ === void 0 ? void 0 : _$PersonID5$$name$.given,
-              mrn: "MRN",
-              date: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("hh:mm A") : "",
-              speciality: (_$SpecialtyID$0$text3 = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$3 = _.SpecialtyID[0]) === null || _$SpecialtyID$3 === void 0 ? void 0 : _$SpecialtyID$3.text) !== null && _$SpecialtyID$0$text3 !== void 0 ? _$SpecialtyID$0$text3 : "",
-              clinic: "Clinic",
-              dob: _ === null || _ === void 0 ? void 0 : (_$PersonID6 = _.PersonID) === null || _$PersonID6 === void 0 ? void 0 : (_$PersonID6$ = _$PersonID6[0]) === null || _$PersonID6$ === void 0 ? void 0 : _$PersonID6$.birthDay,
-              contact: "Contact",
-              visitType: _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              appointmentStatus: "Status",
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment17 = _.Appointment) === null || _$Appointment17 === void 0 ? void 0 : (_$Appointment17$Perso = _$Appointment17.PersonID) === null || _$Appointment17$Perso === void 0 ? void 0 : (_$Appointment17$Perso2 = _$Appointment17$Perso[0]) === null || _$Appointment17$Perso2 === void 0 ? void 0 : (_$Appointment17$Perso3 = _$Appointment17$Perso2.photo) === null || _$Appointment17$Perso3 === void 0 ? void 0 : (_$Appointment17$Perso4 = _$Appointment17$Perso3[0]) === null || _$Appointment17$Perso4 === void 0 ? void 0 : _$Appointment17$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment18 = _.Appointment) === null || _$Appointment18 === void 0 ? void 0 : (_$Appointment18$Perso = _$Appointment18.PersonID) === null || _$Appointment18$Perso === void 0 ? void 0 : (_$Appointment18$Perso2 = _$Appointment18$Perso[0]) === null || _$Appointment18$Perso2 === void 0 ? void 0 : (_$Appointment18$Perso3 = _$Appointment18$Perso2.photo) === null || _$Appointment18$Perso3 === void 0 ? void 0 : (_$Appointment18$Perso4 = _$Appointment18$Perso3[0]) === null || _$Appointment18$Perso4 === void 0 ? void 0 : _$Appointment18$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : (_$Encounter13$patient = _$Encounter13.patient_id) === null || _$Encounter13$patient === void 0 ? void 0 : (_$Encounter13$patient2 = _$Encounter13$patient[0]) === null || _$Encounter13$patient2 === void 0 ? void 0 : (_$Encounter13$patient3 = _$Encounter13$patient2.name) === null || _$Encounter13$patient3 === void 0 ? void 0 : _$Encounter13$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter14 = _.Encounter) === null || _$Encounter14 === void 0 ? void 0 : (_$Encounter14$patient = _$Encounter14.patient_id) === null || _$Encounter14$patient === void 0 ? void 0 : (_$Encounter14$patient2 = _$Encounter14$patient[0]) === null || _$Encounter14$patient2 === void 0 ? void 0 : _$Encounter14$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment19 = _.Appointment) === null || _$Appointment19 === void 0 ? void 0 : _$Appointment19.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : _$Appointment20.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : _$Appointment21.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : _$Appointment22.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : (_$Appointment23$Speci = _$Appointment23.SpecialtyID) === null || _$Appointment23$Speci === void 0 ? void 0 : _$Appointment23$Speci.map(function (spl) {
+                var _spl$coding3, _spl$coding3$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding3 = spl.coding) === null || _spl$coding3 === void 0 ? void 0 : (_spl$coding3$ = _spl$coding3[0]) === null || _spl$coding3$ === void 0 ? void 0 : _spl$coding3$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter15 = _.Encounter) === null || _$Encounter15 === void 0 ? void 0 : (_$Encounter15$practit = _$Encounter15.practitioner_details) === null || _$Encounter15$practit === void 0 ? void 0 : (_$Encounter15$practit2 = _$Encounter15$practit[0]) === null || _$Encounter15$practit2 === void 0 ? void 0 : _$Encounter15$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment24 = _.Appointment) === null || _$Appointment24 === void 0 ? void 0 : (_$Appointment24$Perso = _$Appointment24.PersonID) === null || _$Appointment24$Perso === void 0 ? void 0 : (_$Appointment24$Perso2 = _$Appointment24$Perso[0]) === null || _$Appointment24$Perso2 === void 0 ? void 0 : _$Appointment24$Perso2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter16 = _.Encounter) === null || _$Encounter16 === void 0 ? void 0 : (_$Encounter16$patient = _$Encounter16.patient_id) === null || _$Encounter16$patient === void 0 ? void 0 : (_$Encounter16$patient2 = _$Encounter16$patient[0]) === null || _$Encounter16$patient2 === void 0 ? void 0 : (_$Encounter16$patient3 = _$Encounter16$patient2.telecom) === null || _$Encounter16$patient3 === void 0 ? void 0 : (_$Encounter16$patient4 = _$Encounter16$patient3[0]) === null || _$Encounter16$patient4 === void 0 ? void 0 : _$Encounter16$patient4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter17 = _.Encounter) === null || _$Encounter17 === void 0 ? void 0 : _$Encounter17.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter18 = _.Encounter) === null || _$Encounter18 === void 0 ? void 0 : (_$Encounter18$status = _$Encounter18.status) === null || _$Encounter18$status === void 0 ? void 0 : _$Encounter18$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37673,20 +38045,24 @@ 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 _$PersonID7, _$PersonID7$, _$PersonID7$$name, _$PersonID7$$name$, _$SpecialtyID$0$text4, _$SpecialtyID$4, _$PersonID8, _$PersonID8$;
+            var _$Appointment25, _$Appointment25$Perso, _$Appointment25$Perso2, _$Appointment25$Perso3, _$Appointment25$Perso4, _$Appointment26, _$Appointment26$Perso, _$Appointment26$Perso2, _$Appointment26$Perso3, _$Appointment26$Perso4, _$Encounter19, _$Encounter19$patient, _$Encounter19$patient2, _$Encounter19$patient3, _$Encounter20, _$Encounter20$patient, _$Encounter20$patient2, _$Appointment27, _$Appointment28, _$Appointment29, _$Appointment30, _$Appointment31, _$Appointment31$Speci, _$Encounter21, _$Encounter21$practit, _$Encounter21$practit2, _$Appointment32, _$Appointment32$Perso, _$Appointment32$Perso2, _$Encounter22, _$Encounter22$patient, _$Encounter22$patient2, _$Encounter22$patient3, _$Encounter22$patient4, _$Encounter23, _$Encounter24, _$Encounter24$status;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID7 = _.PersonID) === null || _$PersonID7 === void 0 ? void 0 : (_$PersonID7$ = _$PersonID7[0]) === null || _$PersonID7$ === void 0 ? void 0 : (_$PersonID7$$name = _$PersonID7$.name) === null || _$PersonID7$$name === void 0 ? void 0 : (_$PersonID7$$name$ = _$PersonID7$$name[0]) === null || _$PersonID7$$name$ === void 0 ? void 0 : _$PersonID7$$name$.given,
-              "mrn": 'MRN',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": (_$SpecialtyID$0$text4 = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$4 = _.SpecialtyID[0]) === null || _$SpecialtyID$4 === void 0 ? void 0 : _$SpecialtyID$4.text) !== null && _$SpecialtyID$0$text4 !== void 0 ? _$SpecialtyID$0$text4 : "",
-              "clinic": 'Clinic',
-              "dob": _ === null || _ === void 0 ? void 0 : (_$PersonID8 = _.PersonID) === null || _$PersonID8 === void 0 ? void 0 : (_$PersonID8$ = _$PersonID8[0]) === null || _$PersonID8$ === void 0 ? void 0 : _$PersonID8$.birthDay,
-              "contact": 'Contact',
-              "visitType": _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment25 = _.Appointment) === null || _$Appointment25 === void 0 ? void 0 : (_$Appointment25$Perso = _$Appointment25.PersonID) === null || _$Appointment25$Perso === void 0 ? void 0 : (_$Appointment25$Perso2 = _$Appointment25$Perso[0]) === null || _$Appointment25$Perso2 === void 0 ? void 0 : (_$Appointment25$Perso3 = _$Appointment25$Perso2.photo) === null || _$Appointment25$Perso3 === void 0 ? void 0 : (_$Appointment25$Perso4 = _$Appointment25$Perso3[0]) === null || _$Appointment25$Perso4 === void 0 ? void 0 : _$Appointment25$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment26 = _.Appointment) === null || _$Appointment26 === void 0 ? void 0 : (_$Appointment26$Perso = _$Appointment26.PersonID) === null || _$Appointment26$Perso === void 0 ? void 0 : (_$Appointment26$Perso2 = _$Appointment26$Perso[0]) === null || _$Appointment26$Perso2 === void 0 ? void 0 : (_$Appointment26$Perso3 = _$Appointment26$Perso2.photo) === null || _$Appointment26$Perso3 === void 0 ? void 0 : (_$Appointment26$Perso4 = _$Appointment26$Perso3[0]) === null || _$Appointment26$Perso4 === void 0 ? void 0 : _$Appointment26$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : (_$Encounter19$patient = _$Encounter19.patient_id) === null || _$Encounter19$patient === void 0 ? void 0 : (_$Encounter19$patient2 = _$Encounter19$patient[0]) === null || _$Encounter19$patient2 === void 0 ? void 0 : (_$Encounter19$patient3 = _$Encounter19$patient2.name) === null || _$Encounter19$patient3 === void 0 ? void 0 : _$Encounter19$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$patient = _$Encounter20.patient_id) === null || _$Encounter20$patient === void 0 ? void 0 : (_$Encounter20$patient2 = _$Encounter20$patient[0]) === null || _$Encounter20$patient2 === void 0 ? void 0 : _$Encounter20$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : _$Appointment27.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : _$Appointment28.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : _$Appointment29.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment30 = _.Appointment) === null || _$Appointment30 === void 0 ? void 0 : _$Appointment30.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : (_$Appointment31$Speci = _$Appointment31.SpecialtyID) === null || _$Appointment31$Speci === void 0 ? void 0 : _$Appointment31$Speci.map(function (spl) {
+                var _spl$coding4, _spl$coding4$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding4 = spl.coding) === null || _spl$coding4 === void 0 ? void 0 : (_spl$coding4$ = _spl$coding4[0]) === null || _spl$coding4$ === void 0 ? void 0 : _spl$coding4$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$practit = _$Encounter21.practitioner_details) === null || _$Encounter21$practit === void 0 ? void 0 : (_$Encounter21$practit2 = _$Encounter21$practit[0]) === null || _$Encounter21$practit2 === void 0 ? void 0 : _$Encounter21$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : (_$Appointment32$Perso = _$Appointment32.PersonID) === null || _$Appointment32$Perso === void 0 ? void 0 : (_$Appointment32$Perso2 = _$Appointment32$Perso[0]) === null || _$Appointment32$Perso2 === void 0 ? void 0 : _$Appointment32$Perso2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$patient = _$Encounter22.patient_id) === null || _$Encounter22$patient === void 0 ? void 0 : (_$Encounter22$patient2 = _$Encounter22$patient[0]) === null || _$Encounter22$patient2 === void 0 ? void 0 : (_$Encounter22$patient3 = _$Encounter22$patient2.telecom) === null || _$Encounter22$patient3 === void 0 ? void 0 : (_$Encounter22$patient4 = _$Encounter22$patient3[0]) === null || _$Encounter22$patient4 === void 0 ? void 0 : _$Encounter22$patient4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter23 = _.Encounter) === null || _$Encounter23 === void 0 ? void 0 : _$Encounter23.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter24 = _.Encounter) === null || _$Encounter24 === void 0 ? void 0 : (_$Encounter24$status = _$Encounter24.status) === null || _$Encounter24$status === void 0 ? void 0 : _$Encounter24$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37735,20 +38111,24 @@ var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients
         case 5:
           data = _context5.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result5 = data.result) === null || _data$result5 === void 0 ? void 0 : _data$result5.map(function (_) {
-            var _$PersonID9, _$PersonID9$, _$PersonID9$$name, _$PersonID9$$name$, _$SpecialtyID$0$text5, _$SpecialtyID$5, _$PersonID10, _$PersonID10$;
+            var _$Appointment33, _$Appointment33$Perso, _$Appointment33$Perso2, _$Appointment33$Perso3, _$Appointment33$Perso4, _$Appointment34, _$Appointment34$Perso, _$Appointment34$Perso2, _$Appointment34$Perso3, _$Appointment34$Perso4, _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter25$patient3, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Appointment35, _$Appointment36, _$Appointment37, _$Appointment38, _$Appointment39, _$Appointment39$Speci, _$Encounter27, _$Encounter27$practit, _$Encounter27$practit2, _$Appointment40, _$Appointment40$Perso, _$Appointment40$Perso2, _$Encounter28, _$Encounter28$patient, _$Encounter28$patient2, _$Encounter28$patient3, _$Encounter28$patient4, _$Encounter29, _$Encounter30, _$Encounter30$status;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID9 = _.PersonID) === null || _$PersonID9 === void 0 ? void 0 : (_$PersonID9$ = _$PersonID9[0]) === null || _$PersonID9$ === void 0 ? void 0 : (_$PersonID9$$name = _$PersonID9$.name) === null || _$PersonID9$$name === void 0 ? void 0 : (_$PersonID9$$name$ = _$PersonID9$$name[0]) === null || _$PersonID9$$name$ === void 0 ? void 0 : _$PersonID9$$name$.given,
-              "mrn": 'MRN',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": (_$SpecialtyID$0$text5 = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$5 = _.SpecialtyID[0]) === null || _$SpecialtyID$5 === void 0 ? void 0 : _$SpecialtyID$5.text) !== null && _$SpecialtyID$0$text5 !== void 0 ? _$SpecialtyID$0$text5 : "",
-              "clinic": 'Clinic',
-              "dob": _ === null || _ === void 0 ? void 0 : (_$PersonID10 = _.PersonID) === null || _$PersonID10 === void 0 ? void 0 : (_$PersonID10$ = _$PersonID10[0]) === null || _$PersonID10$ === void 0 ? void 0 : _$PersonID10$.birthDay,
-              "contact": 'Contact',
-              "visitType": _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment33 = _.Appointment) === null || _$Appointment33 === void 0 ? void 0 : (_$Appointment33$Perso = _$Appointment33.PersonID) === null || _$Appointment33$Perso === void 0 ? void 0 : (_$Appointment33$Perso2 = _$Appointment33$Perso[0]) === null || _$Appointment33$Perso2 === void 0 ? void 0 : (_$Appointment33$Perso3 = _$Appointment33$Perso2.photo) === null || _$Appointment33$Perso3 === void 0 ? void 0 : (_$Appointment33$Perso4 = _$Appointment33$Perso3[0]) === null || _$Appointment33$Perso4 === void 0 ? void 0 : _$Appointment33$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : (_$Appointment34$Perso = _$Appointment34.PersonID) === null || _$Appointment34$Perso === void 0 ? void 0 : (_$Appointment34$Perso2 = _$Appointment34$Perso[0]) === null || _$Appointment34$Perso2 === void 0 ? void 0 : (_$Appointment34$Perso3 = _$Appointment34$Perso2.photo) === null || _$Appointment34$Perso3 === void 0 ? void 0 : (_$Appointment34$Perso4 = _$Appointment34$Perso3[0]) === null || _$Appointment34$Perso4 === void 0 ? void 0 : _$Appointment34$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter25 = _.Encounter) === null || _$Encounter25 === void 0 ? void 0 : (_$Encounter25$patient = _$Encounter25.patient_id) === null || _$Encounter25$patient === void 0 ? void 0 : (_$Encounter25$patient2 = _$Encounter25$patient[0]) === null || _$Encounter25$patient2 === void 0 ? void 0 : (_$Encounter25$patient3 = _$Encounter25$patient2.name) === null || _$Encounter25$patient3 === void 0 ? void 0 : _$Encounter25$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter26 = _.Encounter) === null || _$Encounter26 === void 0 ? void 0 : (_$Encounter26$patient = _$Encounter26.patient_id) === null || _$Encounter26$patient === void 0 ? void 0 : (_$Encounter26$patient2 = _$Encounter26$patient[0]) === null || _$Encounter26$patient2 === void 0 ? void 0 : _$Encounter26$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment36 = _.Appointment) === null || _$Appointment36 === void 0 ? void 0 : _$Appointment36.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : _$Appointment37.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : _$Appointment38.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : (_$Appointment39$Speci = _$Appointment39.SpecialtyID) === null || _$Appointment39$Speci === void 0 ? void 0 : _$Appointment39$Speci.map(function (spl) {
+                var _spl$coding5, _spl$coding5$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding5 = spl.coding) === null || _spl$coding5 === void 0 ? void 0 : (_spl$coding5$ = _spl$coding5[0]) === null || _spl$coding5$ === void 0 ? void 0 : _spl$coding5$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : (_$Encounter27$practit = _$Encounter27.practitioner_details) === null || _$Encounter27$practit === void 0 ? void 0 : (_$Encounter27$practit2 = _$Encounter27$practit[0]) === null || _$Encounter27$practit2 === void 0 ? void 0 : _$Encounter27$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : (_$Appointment40$Perso = _$Appointment40.PersonID) === null || _$Appointment40$Perso === void 0 ? void 0 : (_$Appointment40$Perso2 = _$Appointment40$Perso[0]) === null || _$Appointment40$Perso2 === void 0 ? void 0 : _$Appointment40$Perso2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter28 = _.Encounter) === null || _$Encounter28 === void 0 ? void 0 : (_$Encounter28$patient = _$Encounter28.patient_id) === null || _$Encounter28$patient === void 0 ? void 0 : (_$Encounter28$patient2 = _$Encounter28$patient[0]) === null || _$Encounter28$patient2 === void 0 ? void 0 : (_$Encounter28$patient3 = _$Encounter28$patient2.telecom) === null || _$Encounter28$patient3 === void 0 ? void 0 : (_$Encounter28$patient4 = _$Encounter28$patient3[0]) === null || _$Encounter28$patient4 === void 0 ? void 0 : _$Encounter28$patient4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : _$Encounter29.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$status = _$Encounter30.status) === null || _$Encounter30$status === void 0 ? void 0 : _$Encounter30$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37797,20 +38177,24 @@ var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits
         case 5:
           data = _context6.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result6 = data.result) === null || _data$result6 === void 0 ? void 0 : _data$result6.map(function (_) {
-            var _$PersonID11, _$PersonID11$, _$PersonID11$$name, _$PersonID11$$name$, _$SpecialtyID$0$text6, _$SpecialtyID$6, _$PersonID12, _$PersonID12$;
+            var _$Appointment41, _$Appointment41$Perso, _$Appointment41$Perso2, _$Appointment41$Perso3, _$Appointment41$Perso4, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Appointment42$Perso3, _$Appointment42$Perso4, _$Encounter31, _$Encounter31$patient, _$Encounter31$patient2, _$Encounter31$patient3, _$Encounter32, _$Encounter32$patient, _$Encounter32$patient2, _$Appointment43, _$Appointment44, _$Appointment45, _$Appointment46, _$Appointment47, _$Appointment47$Speci, _$Encounter33, _$Encounter33$practit, _$Encounter33$practit2, _$Appointment48, _$Appointment48$Perso, _$Appointment48$Perso2, _$Encounter34, _$Encounter34$patient, _$Encounter34$patient2, _$Encounter34$patient3, _$Encounter34$patient4, _$Encounter35, _$Encounter36, _$Encounter36$status;
 
             return {
-              img: "https://www.fillmurray.com/640/360",
-              name: _ === null || _ === void 0 ? void 0 : (_$PersonID11 = _.PersonID) === null || _$PersonID11 === void 0 ? void 0 : (_$PersonID11$ = _$PersonID11[0]) === null || _$PersonID11$ === void 0 ? void 0 : (_$PersonID11$$name = _$PersonID11$.name) === null || _$PersonID11$$name === void 0 ? void 0 : (_$PersonID11$$name$ = _$PersonID11$$name[0]) === null || _$PersonID11$$name$ === void 0 ? void 0 : _$PersonID11$$name$.given,
-              mrn: "MRN",
-              date: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
-              time: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("hh:mm A") : "",
-              speciality: (_$SpecialtyID$0$text6 = _ === null || _ === void 0 ? void 0 : (_$SpecialtyID$6 = _.SpecialtyID[0]) === null || _$SpecialtyID$6 === void 0 ? void 0 : _$SpecialtyID$6.text) !== null && _$SpecialtyID$0$text6 !== void 0 ? _$SpecialtyID$0$text6 : "",
-              clinic: "Clinic",
-              dob: _ === null || _ === void 0 ? void 0 : (_$PersonID12 = _.PersonID) === null || _$PersonID12 === void 0 ? void 0 : (_$PersonID12$ = _$PersonID12[0]) === null || _$PersonID12$ === void 0 ? void 0 : _$PersonID12$.birthDay,
-              contact: "Contact",
-              visitType: _ === null || _ === void 0 ? void 0 : _.appointmentType,
-              appointmentStatus: "Status",
+              img: (_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : (_$Appointment41$Perso = _$Appointment41.PersonID) === null || _$Appointment41$Perso === void 0 ? void 0 : (_$Appointment41$Perso2 = _$Appointment41$Perso[0]) === null || _$Appointment41$Perso2 === void 0 ? void 0 : (_$Appointment41$Perso3 = _$Appointment41$Perso2.photo) === null || _$Appointment41$Perso3 === void 0 ? void 0 : (_$Appointment41$Perso4 = _$Appointment41$Perso3[0]) === null || _$Appointment41$Perso4 === void 0 ? void 0 : _$Appointment41$Perso4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$Appointment42 = _.Appointment) === null || _$Appointment42 === void 0 ? void 0 : (_$Appointment42$Perso = _$Appointment42.PersonID) === null || _$Appointment42$Perso === void 0 ? void 0 : (_$Appointment42$Perso2 = _$Appointment42$Perso[0]) === null || _$Appointment42$Perso2 === void 0 ? void 0 : (_$Appointment42$Perso3 = _$Appointment42$Perso2.photo) === null || _$Appointment42$Perso3 === void 0 ? void 0 : (_$Appointment42$Perso4 = _$Appointment42$Perso3[0]) === null || _$Appointment42$Perso4 === void 0 ? void 0 : _$Appointment42$Perso4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$Encounter31 = _.Encounter) === null || _$Encounter31 === void 0 ? void 0 : (_$Encounter31$patient = _$Encounter31.patient_id) === null || _$Encounter31$patient === void 0 ? void 0 : (_$Encounter31$patient2 = _$Encounter31$patient[0]) === null || _$Encounter31$patient2 === void 0 ? void 0 : (_$Encounter31$patient3 = _$Encounter31$patient2.name) === null || _$Encounter31$patient3 === void 0 ? void 0 : _$Encounter31$patient3[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$Encounter32 = _.Encounter) === null || _$Encounter32 === void 0 ? void 0 : (_$Encounter32$patient = _$Encounter32.patient_id) === null || _$Encounter32$patient === void 0 ? void 0 : (_$Encounter32$patient2 = _$Encounter32$patient[0]) === null || _$Encounter32$patient2 === void 0 ? void 0 : _$Encounter32$patient2.MRN,
+              date: (_ === null || _ === void 0 ? void 0 : (_$Appointment43 = _.Appointment) === null || _$Appointment43 === void 0 ? void 0 : _$Appointment43.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment44 = _.Appointment) === null || _$Appointment44 === void 0 ? void 0 : _$Appointment44.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$Appointment45 = _.Appointment) === null || _$Appointment45 === void 0 ? void 0 : _$Appointment45.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$Appointment46 = _.Appointment) === null || _$Appointment46 === void 0 ? void 0 : _$Appointment46.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$Appointment47 = _.Appointment) === null || _$Appointment47 === void 0 ? void 0 : (_$Appointment47$Speci = _$Appointment47.SpecialtyID) === null || _$Appointment47$Speci === void 0 ? void 0 : _$Appointment47$Speci.map(function (spl) {
+                var _spl$coding6, _spl$coding6$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding6 = spl.coding) === null || _spl$coding6 === void 0 ? void 0 : (_spl$coding6$ = _spl$coding6[0]) === null || _spl$coding6$ === void 0 ? void 0 : _spl$coding6$.display;
+              }).join(", "),
+              clinic: _ === null || _ === void 0 ? void 0 : (_$Encounter33 = _.Encounter) === null || _$Encounter33 === void 0 ? void 0 : (_$Encounter33$practit = _$Encounter33.practitioner_details) === null || _$Encounter33$practit === void 0 ? void 0 : (_$Encounter33$practit2 = _$Encounter33$practit[0]) === null || _$Encounter33$practit2 === void 0 ? void 0 : _$Encounter33$practit2.clinic,
+              dob: _ === null || _ === void 0 ? void 0 : (_$Appointment48 = _.Appointment) === null || _$Appointment48 === void 0 ? void 0 : (_$Appointment48$Perso = _$Appointment48.PersonID) === null || _$Appointment48$Perso === void 0 ? void 0 : (_$Appointment48$Perso2 = _$Appointment48$Perso[0]) === null || _$Appointment48$Perso2 === void 0 ? void 0 : _$Appointment48$Perso2.birthDay,
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$Encounter34 = _.Encounter) === null || _$Encounter34 === void 0 ? void 0 : (_$Encounter34$patient = _$Encounter34.patient_id) === null || _$Encounter34$patient === void 0 ? void 0 : (_$Encounter34$patient2 = _$Encounter34$patient[0]) === null || _$Encounter34$patient2 === void 0 ? void 0 : (_$Encounter34$patient3 = _$Encounter34$patient2.telecom) === null || _$Encounter34$patient3 === void 0 ? void 0 : (_$Encounter34$patient4 = _$Encounter34$patient3[0]) === null || _$Encounter34$patient4 === void 0 ? void 0 : _$Encounter34$patient4.value),
+              visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : _$Encounter35.visit_type,
+              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter36 = _.Encounter) === null || _$Encounter36 === void 0 ? void 0 : (_$Encounter36$status = _$Encounter36.status) === null || _$Encounter36$status === void 0 ? void 0 : _$Encounter36$status.display,
               "Register Visit": true,
               "Modify Appointment": true,
               "Cancel Appointment": true,
@@ -37854,27 +38238,32 @@ var GET_APPOINTMENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getAppoi
           _context7.prev = 2;
           _context7.next = 5;
           return fetchData$3({
-            body: query$4.getAppointmentsNurse(payload)
+            body: JSON.stringify(query$4.getAppointmentsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID13, _$PersonID13$, _$PersonID13$$name, _$PersonID13$$name$, _$appointmentType;
+            var _$appointmentId, _$appointmentId$, _$appointmentId$$Pers, _$appointmentId$$Pers2, _$appointmentId$$Pers3, _$appointmentId$$Pers4, _$appointmentId2, _$appointmentId2$, _$appointmentId2$$Per, _$appointmentId2$$Per2, _$appointmentId2$$Per3, _$appointmentId2$$Per4, _$patient_id, _$patient_id$, _$patient_id$$name, _$patient_id2, _$patient_id2$, _$patient_id3, _$patient_id3$, _$appointmentId3, _$appointmentId3$, _$appointmentId4, _$appointmentId4$, _$appointmentId5, _$appointmentId5$, _$appointmentId6, _$appointmentId6$, _$appointmentId7, _$appointmentId7$, _$visit_type, _$appointmentId8, _$appointmentId8$, _$appointmentId8$$Spe, _$practitioner_detail, _$practitioner_detail2, _$status;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID13 = _.PersonID) === null || _$PersonID13 === void 0 ? void 0 : (_$PersonID13$ = _$PersonID13[0]) === null || _$PersonID13$ === void 0 ? void 0 : (_$PersonID13$$name = _$PersonID13$.name) === null || _$PersonID13$$name === void 0 ? void 0 : (_$PersonID13$$name$ = _$PersonID13$$name[0]) === null || _$PersonID13$$name$ === void 0 ? void 0 : _$PersonID13$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType !== void 0 ? _$appointmentType : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId = _.appointmentId) === null || _$appointmentId === void 0 ? void 0 : (_$appointmentId$ = _$appointmentId[0]) === null || _$appointmentId$ === void 0 ? void 0 : (_$appointmentId$$Pers = _$appointmentId$.PersonID) === null || _$appointmentId$$Pers === void 0 ? void 0 : (_$appointmentId$$Pers2 = _$appointmentId$$Pers[0]) === null || _$appointmentId$$Pers2 === void 0 ? void 0 : (_$appointmentId$$Pers3 = _$appointmentId$$Pers2.photo) === null || _$appointmentId$$Pers3 === void 0 ? void 0 : (_$appointmentId$$Pers4 = _$appointmentId$$Pers3[0]) === null || _$appointmentId$$Pers4 === void 0 ? void 0 : _$appointmentId$$Pers4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId2 = _.appointmentId) === null || _$appointmentId2 === void 0 ? void 0 : (_$appointmentId2$ = _$appointmentId2[0]) === null || _$appointmentId2$ === void 0 ? void 0 : (_$appointmentId2$$Per = _$appointmentId2$.PersonID) === null || _$appointmentId2$$Per === void 0 ? void 0 : (_$appointmentId2$$Per2 = _$appointmentId2$$Per[0]) === null || _$appointmentId2$$Per2 === void 0 ? void 0 : (_$appointmentId2$$Per3 = _$appointmentId2$$Per2.photo) === null || _$appointmentId2$$Per3 === void 0 ? void 0 : (_$appointmentId2$$Per4 = _$appointmentId2$$Per3[0]) === null || _$appointmentId2$$Per4 === void 0 ? void 0 : _$appointmentId2$$Per4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id = _.patient_id) === null || _$patient_id === void 0 ? void 0 : (_$patient_id$ = _$patient_id[0]) === null || _$patient_id$ === void 0 ? void 0 : (_$patient_id$$name = _$patient_id$.name) === null || _$patient_id$$name === void 0 ? void 0 : _$patient_id$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id2 = _.patient_id) === null || _$patient_id2 === void 0 ? void 0 : (_$patient_id2$ = _$patient_id2[0]) === null || _$patient_id2$ === void 0 ? void 0 : _$patient_id2$.alias) || "",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : _$patient_id3$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId3 = _.appointmentId) === null || _$appointmentId3 === void 0 ? void 0 : (_$appointmentId3$ = _$appointmentId3[0]) === null || _$appointmentId3$ === void 0 ? void 0 : _$appointmentId3$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId5 = _.appointmentId) === null || _$appointmentId5 === void 0 ? void 0 : (_$appointmentId5$ = _$appointmentId5[0]) === null || _$appointmentId5$ === void 0 ? void 0 : _$appointmentId5$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId7 = _.appointmentId) === null || _$appointmentId7 === void 0 ? void 0 : (_$appointmentId7$ = _$appointmentId7[0]) === null || _$appointmentId7$ === void 0 ? void 0 : _$appointmentId7$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type !== void 0 ? _$visit_type : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId8 = _.appointmentId) === null || _$appointmentId8 === void 0 ? void 0 : (_$appointmentId8$ = _$appointmentId8[0]) === null || _$appointmentId8$ === void 0 ? void 0 : (_$appointmentId8$$Spe = _$appointmentId8$.SpecialtyID) === null || _$appointmentId8$$Spe === void 0 ? void 0 : _$appointmentId8$$Spe.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_detail = _.practitioner_details) === null || _$practitioner_detail === void 0 ? void 0 : (_$practitioner_detail2 = _$practitioner_detail[0]) === null || _$practitioner_detail2 === void 0 ? void 0 : _$practitioner_detail2.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status = _.status) === null || _$status === void 0 ? void 0 : _$status.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -37913,27 +38302,32 @@ var GET_FIRST_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getFirst
           _context8.prev = 2;
           _context8.next = 5;
           return fetchData$3({
-            body: query$4.getFirstVisitsNurse(payload)
+            body: JSON.stringify(query$4.getFirstVisitsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID14, _$PersonID14$, _$PersonID14$$name, _$PersonID14$$name$, _$appointmentType2;
+            var _$appointmentId9, _$appointmentId9$, _$appointmentId9$$Per, _$appointmentId9$$Per2, _$appointmentId9$$Per3, _$appointmentId9$$Per4, _$appointmentId10, _$appointmentId10$, _$appointmentId10$$Pe, _$appointmentId10$$Pe2, _$appointmentId10$$Pe3, _$appointmentId10$$Pe4, _$patient_id4, _$patient_id4$, _$patient_id4$$name, _$patient_id5, _$patient_id5$, _$patient_id6, _$patient_id6$, _$appointmentId11, _$appointmentId11$, _$appointmentId12, _$appointmentId12$, _$appointmentId13, _$appointmentId13$, _$appointmentId14, _$appointmentId14$, _$appointmentId15, _$appointmentId15$, _$visit_type2, _$appointmentId16, _$appointmentId16$, _$appointmentId16$$Sp, _$practitioner_detail3, _$practitioner_detail4, _$status2;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID14 = _.PersonID) === null || _$PersonID14 === void 0 ? void 0 : (_$PersonID14$ = _$PersonID14[0]) === null || _$PersonID14$ === void 0 ? void 0 : (_$PersonID14$$name = _$PersonID14$.name) === null || _$PersonID14$$name === void 0 ? void 0 : (_$PersonID14$$name$ = _$PersonID14$$name[0]) === null || _$PersonID14$$name$ === void 0 ? void 0 : _$PersonID14$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType2 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType2 !== void 0 ? _$appointmentType2 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId9 = _.appointmentId) === null || _$appointmentId9 === void 0 ? void 0 : (_$appointmentId9$ = _$appointmentId9[0]) === null || _$appointmentId9$ === void 0 ? void 0 : (_$appointmentId9$$Per = _$appointmentId9$.PersonID) === null || _$appointmentId9$$Per === void 0 ? void 0 : (_$appointmentId9$$Per2 = _$appointmentId9$$Per[0]) === null || _$appointmentId9$$Per2 === void 0 ? void 0 : (_$appointmentId9$$Per3 = _$appointmentId9$$Per2.photo) === null || _$appointmentId9$$Per3 === void 0 ? void 0 : (_$appointmentId9$$Per4 = _$appointmentId9$$Per3[0]) === null || _$appointmentId9$$Per4 === void 0 ? void 0 : _$appointmentId9$$Per4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId10 = _.appointmentId) === null || _$appointmentId10 === void 0 ? void 0 : (_$appointmentId10$ = _$appointmentId10[0]) === null || _$appointmentId10$ === void 0 ? void 0 : (_$appointmentId10$$Pe = _$appointmentId10$.PersonID) === null || _$appointmentId10$$Pe === void 0 ? void 0 : (_$appointmentId10$$Pe2 = _$appointmentId10$$Pe[0]) === null || _$appointmentId10$$Pe2 === void 0 ? void 0 : (_$appointmentId10$$Pe3 = _$appointmentId10$$Pe2.photo) === null || _$appointmentId10$$Pe3 === void 0 ? void 0 : (_$appointmentId10$$Pe4 = _$appointmentId10$$Pe3[0]) === null || _$appointmentId10$$Pe4 === void 0 ? void 0 : _$appointmentId10$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id4 = _.patient_id) === null || _$patient_id4 === void 0 ? void 0 : (_$patient_id4$ = _$patient_id4[0]) === null || _$patient_id4$ === void 0 ? void 0 : (_$patient_id4$$name = _$patient_id4$.name) === null || _$patient_id4$$name === void 0 ? void 0 : _$patient_id4$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id5 = _.patient_id) === null || _$patient_id5 === void 0 ? void 0 : (_$patient_id5$ = _$patient_id5[0]) === null || _$patient_id5$ === void 0 ? void 0 : _$patient_id5$.alias) || "",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id6 = _.patient_id) === null || _$patient_id6 === void 0 ? void 0 : (_$patient_id6$ = _$patient_id6[0]) === null || _$patient_id6$ === void 0 ? void 0 : _$patient_id6$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId12 = _.appointmentId) === null || _$appointmentId12 === void 0 ? void 0 : (_$appointmentId12$ = _$appointmentId12[0]) === null || _$appointmentId12$ === void 0 ? void 0 : _$appointmentId12$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : _$appointmentId13$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId14 = _.appointmentId) === null || _$appointmentId14 === void 0 ? void 0 : (_$appointmentId14$ = _$appointmentId14[0]) === null || _$appointmentId14$ === void 0 ? void 0 : _$appointmentId14$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId15 = _.appointmentId) === null || _$appointmentId15 === void 0 ? void 0 : (_$appointmentId15$ = _$appointmentId15[0]) === null || _$appointmentId15$ === void 0 ? void 0 : _$appointmentId15$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type2 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type2 !== void 0 ? _$visit_type2 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId16 = _.appointmentId) === null || _$appointmentId16 === void 0 ? void 0 : (_$appointmentId16$ = _$appointmentId16[0]) === null || _$appointmentId16$ === void 0 ? void 0 : (_$appointmentId16$$Sp = _$appointmentId16$.SpecialtyID) === null || _$appointmentId16$$Sp === void 0 ? void 0 : _$appointmentId16$$Sp.map(function (spl) {
+                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_detail3 = _.practitioner_details) === null || _$practitioner_detail3 === void 0 ? void 0 : (_$practitioner_detail4 = _$practitioner_detail3[0]) === null || _$practitioner_detail4 === void 0 ? void 0 : _$practitioner_detail4.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status2 = _.status) === null || _$status2 === void 0 ? void 0 : _$status2.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -37972,27 +38366,32 @@ var GET_NEW_PATIENTS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getNewPa
           _context9.prev = 2;
           _context9.next = 5;
           return fetchData$3({
-            body: query$4.getNewPatientsNurse(payload)
+            body: JSON.stringify(query$4.getNewPatientsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID15, _$PersonID15$, _$PersonID15$$name, _$PersonID15$$name$, _$appointmentType3;
+            var _$appointmentId17, _$appointmentId17$, _$appointmentId17$$Pe, _$appointmentId17$$Pe2, _$appointmentId17$$Pe3, _$appointmentId17$$Pe4, _$appointmentId18, _$appointmentId18$, _$appointmentId18$$Pe, _$appointmentId18$$Pe2, _$appointmentId18$$Pe3, _$appointmentId18$$Pe4, _$patient_id7, _$patient_id7$, _$patient_id7$$name, _$patient_id8, _$patient_id8$, _$patient_id9, _$patient_id9$, _$appointmentId19, _$appointmentId19$, _$appointmentId20, _$appointmentId20$, _$appointmentId21, _$appointmentId21$, _$appointmentId22, _$appointmentId22$, _$appointmentId23, _$appointmentId23$, _$visit_type3, _$appointmentId24, _$appointmentId24$, _$appointmentId24$$Sp, _$practitioner_detail5, _$practitioner_detail6, _$status3;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID15 = _.PersonID) === null || _$PersonID15 === void 0 ? void 0 : (_$PersonID15$ = _$PersonID15[0]) === null || _$PersonID15$ === void 0 ? void 0 : (_$PersonID15$$name = _$PersonID15$.name) === null || _$PersonID15$$name === void 0 ? void 0 : (_$PersonID15$$name$ = _$PersonID15$$name[0]) === null || _$PersonID15$$name$ === void 0 ? void 0 : _$PersonID15$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType3 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType3 !== void 0 ? _$appointmentType3 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId17 = _.appointmentId) === null || _$appointmentId17 === void 0 ? void 0 : (_$appointmentId17$ = _$appointmentId17[0]) === null || _$appointmentId17$ === void 0 ? void 0 : (_$appointmentId17$$Pe = _$appointmentId17$.PersonID) === null || _$appointmentId17$$Pe === void 0 ? void 0 : (_$appointmentId17$$Pe2 = _$appointmentId17$$Pe[0]) === null || _$appointmentId17$$Pe2 === void 0 ? void 0 : (_$appointmentId17$$Pe3 = _$appointmentId17$$Pe2.photo) === null || _$appointmentId17$$Pe3 === void 0 ? void 0 : (_$appointmentId17$$Pe4 = _$appointmentId17$$Pe3[0]) === null || _$appointmentId17$$Pe4 === void 0 ? void 0 : _$appointmentId17$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : (_$appointmentId18$$Pe = _$appointmentId18$.PersonID) === null || _$appointmentId18$$Pe === void 0 ? void 0 : (_$appointmentId18$$Pe2 = _$appointmentId18$$Pe[0]) === null || _$appointmentId18$$Pe2 === void 0 ? void 0 : (_$appointmentId18$$Pe3 = _$appointmentId18$$Pe2.photo) === null || _$appointmentId18$$Pe3 === void 0 ? void 0 : (_$appointmentId18$$Pe4 = _$appointmentId18$$Pe3[0]) === null || _$appointmentId18$$Pe4 === void 0 ? void 0 : _$appointmentId18$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : (_$patient_id7$$name = _$patient_id7$.name) === null || _$patient_id7$$name === void 0 ? void 0 : _$patient_id7$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id8 = _.patient_id) === null || _$patient_id8 === void 0 ? void 0 : (_$patient_id8$ = _$patient_id8[0]) === null || _$patient_id8$ === void 0 ? void 0 : _$patient_id8$.alias) || "",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id9 = _.patient_id) === null || _$patient_id9 === void 0 ? void 0 : (_$patient_id9$ = _$patient_id9[0]) === null || _$patient_id9$ === void 0 ? void 0 : _$patient_id9$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId19 = _.appointmentId) === null || _$appointmentId19 === void 0 ? void 0 : (_$appointmentId19$ = _$appointmentId19[0]) === null || _$appointmentId19$ === void 0 ? void 0 : _$appointmentId19$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId21 = _.appointmentId) === null || _$appointmentId21 === void 0 ? void 0 : (_$appointmentId21$ = _$appointmentId21[0]) === null || _$appointmentId21$ === void 0 ? void 0 : _$appointmentId21$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId22 = _.appointmentId) === null || _$appointmentId22 === void 0 ? void 0 : (_$appointmentId22$ = _$appointmentId22[0]) === null || _$appointmentId22$ === void 0 ? void 0 : _$appointmentId22$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId23 = _.appointmentId) === null || _$appointmentId23 === void 0 ? void 0 : (_$appointmentId23$ = _$appointmentId23[0]) === null || _$appointmentId23$ === void 0 ? void 0 : _$appointmentId23$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type3 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type3 !== void 0 ? _$visit_type3 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId24 = _.appointmentId) === null || _$appointmentId24 === void 0 ? void 0 : (_$appointmentId24$ = _$appointmentId24[0]) === null || _$appointmentId24$ === void 0 ? void 0 : (_$appointmentId24$$Sp = _$appointmentId24$.SpecialtyID) === null || _$appointmentId24$$Sp === void 0 ? void 0 : _$appointmentId24$$Sp.map(function (spl) {
+                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_detail5 = _.practitioner_details) === null || _$practitioner_detail5 === void 0 ? void 0 : (_$practitioner_detail6 = _$practitioner_detail5[0]) === null || _$practitioner_detail6 === void 0 ? void 0 : _$practitioner_detail6.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status3 = _.status) === null || _$status3 === void 0 ? void 0 : _$status3.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38031,27 +38430,32 @@ var GET_OTHER_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getOther
           _context10.prev = 2;
           _context10.next = 5;
           return fetchData$3({
-            body: query$4.getOtherVisitsNurse(payload)
+            body: JSON.stringify(query$4.getOtherVisitsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID16, _$PersonID16$, _$PersonID16$$name, _$PersonID16$$name$, _$appointmentType4;
+            var _$appointmentId25, _$appointmentId25$, _$appointmentId25$$Pe, _$appointmentId25$$Pe2, _$appointmentId25$$Pe3, _$appointmentId25$$Pe4, _$appointmentId26, _$appointmentId26$, _$appointmentId26$$Pe, _$appointmentId26$$Pe2, _$appointmentId26$$Pe3, _$appointmentId26$$Pe4, _$patient_id10, _$patient_id10$, _$patient_id10$$name, _$patient_id11, _$patient_id11$, _$patient_id12, _$patient_id12$, _$appointmentId27, _$appointmentId27$, _$appointmentId28, _$appointmentId28$, _$appointmentId29, _$appointmentId29$, _$appointmentId30, _$appointmentId30$, _$appointmentId31, _$appointmentId31$, _$visit_type4, _$appointmentId32, _$appointmentId32$, _$appointmentId32$$Sp, _$practitioner_detail7, _$practitioner_detail8, _$status4;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID16 = _.PersonID) === null || _$PersonID16 === void 0 ? void 0 : (_$PersonID16$ = _$PersonID16[0]) === null || _$PersonID16$ === void 0 ? void 0 : (_$PersonID16$$name = _$PersonID16$.name) === null || _$PersonID16$$name === void 0 ? void 0 : (_$PersonID16$$name$ = _$PersonID16$$name[0]) === null || _$PersonID16$$name$ === void 0 ? void 0 : _$PersonID16$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType4 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType4 !== void 0 ? _$appointmentType4 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId25 = _.appointmentId) === null || _$appointmentId25 === void 0 ? void 0 : (_$appointmentId25$ = _$appointmentId25[0]) === null || _$appointmentId25$ === void 0 ? void 0 : (_$appointmentId25$$Pe = _$appointmentId25$.PersonID) === null || _$appointmentId25$$Pe === void 0 ? void 0 : (_$appointmentId25$$Pe2 = _$appointmentId25$$Pe[0]) === null || _$appointmentId25$$Pe2 === void 0 ? void 0 : (_$appointmentId25$$Pe3 = _$appointmentId25$$Pe2.photo) === null || _$appointmentId25$$Pe3 === void 0 ? void 0 : (_$appointmentId25$$Pe4 = _$appointmentId25$$Pe3[0]) === null || _$appointmentId25$$Pe4 === void 0 ? void 0 : _$appointmentId25$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : (_$appointmentId26$$Pe = _$appointmentId26$.PersonID) === null || _$appointmentId26$$Pe === void 0 ? void 0 : (_$appointmentId26$$Pe2 = _$appointmentId26$$Pe[0]) === null || _$appointmentId26$$Pe2 === void 0 ? void 0 : (_$appointmentId26$$Pe3 = _$appointmentId26$$Pe2.photo) === null || _$appointmentId26$$Pe3 === void 0 ? void 0 : (_$appointmentId26$$Pe4 = _$appointmentId26$$Pe3[0]) === null || _$appointmentId26$$Pe4 === void 0 ? void 0 : _$appointmentId26$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id10 = _.patient_id) === null || _$patient_id10 === void 0 ? void 0 : (_$patient_id10$ = _$patient_id10[0]) === null || _$patient_id10$ === void 0 ? void 0 : (_$patient_id10$$name = _$patient_id10$.name) === null || _$patient_id10$$name === void 0 ? void 0 : _$patient_id10$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id11 = _.patient_id) === null || _$patient_id11 === void 0 ? void 0 : (_$patient_id11$ = _$patient_id11[0]) === null || _$patient_id11$ === void 0 ? void 0 : _$patient_id11$.alias) || "",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id12 = _.patient_id) === null || _$patient_id12 === void 0 ? void 0 : (_$patient_id12$ = _$patient_id12[0]) === null || _$patient_id12$ === void 0 ? void 0 : _$patient_id12$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId27 = _.appointmentId) === null || _$appointmentId27 === void 0 ? void 0 : (_$appointmentId27$ = _$appointmentId27[0]) === null || _$appointmentId27$ === void 0 ? void 0 : _$appointmentId27$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId29 = _.appointmentId) === null || _$appointmentId29 === void 0 ? void 0 : (_$appointmentId29$ = _$appointmentId29[0]) === null || _$appointmentId29$ === void 0 ? void 0 : _$appointmentId29$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId30 = _.appointmentId) === null || _$appointmentId30 === void 0 ? void 0 : (_$appointmentId30$ = _$appointmentId30[0]) === null || _$appointmentId30$ === void 0 ? void 0 : _$appointmentId30$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId31 = _.appointmentId) === null || _$appointmentId31 === void 0 ? void 0 : (_$appointmentId31$ = _$appointmentId31[0]) === null || _$appointmentId31$ === void 0 ? void 0 : _$appointmentId31$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type4 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type4 !== void 0 ? _$visit_type4 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId32 = _.appointmentId) === null || _$appointmentId32 === void 0 ? void 0 : (_$appointmentId32$ = _$appointmentId32[0]) === null || _$appointmentId32$ === void 0 ? void 0 : (_$appointmentId32$$Sp = _$appointmentId32$.SpecialtyID) === null || _$appointmentId32$$Sp === void 0 ? void 0 : _$appointmentId32$$Sp.map(function (spl) {
+                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_detail7 = _.practitioner_details) === null || _$practitioner_detail7 === void 0 ? void 0 : (_$practitioner_detail8 = _$practitioner_detail7[0]) === null || _$practitioner_detail8 === void 0 ? void 0 : _$practitioner_detail8.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status4 = _.status) === null || _$status4 === void 0 ? void 0 : _$status4.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38090,27 +38494,31 @@ var GET_TODAY_VISITS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getToday
           _context11.prev = 2;
           _context11.next = 5;
           return fetchData$3({
-            body: query$4.getTodayVisitsNurse(payload)
+            body: JSON.stringify(query$4.getTodayVisitsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID17, _$PersonID17$, _$PersonID17$$name, _$PersonID17$$name$, _$appointmentType5;
+            var _$appointmentId33, _$appointmentId33$, _$appointmentId33$$Pe, _$appointmentId33$$Pe2, _$appointmentId33$$Pe3, _$appointmentId34, _$appointmentId34$, _$appointmentId34$$Pe, _$appointmentId34$$Pe2, _$appointmentId34$$Pe3, _$patient_id13, _$patient_id13$, _$patient_id13$$name, _$patient_id14, _$patient_id14$, _$patient_id15, _$patient_id15$, _$appointmentId35, _$appointmentId35$, _$appointmentId36, _$appointmentId36$, _$appointmentId37, _$appointmentId37$, _$appointmentId38, _$appointmentId38$, _$appointmentId39, _$appointmentId39$, _$appointmentId39$$Sp, _$patient_id16, _$patient_id16$, _$patient_id16$$telec, _$patient_id16$$telec2, _$status5;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID17 = _.PersonID) === null || _$PersonID17 === void 0 ? void 0 : (_$PersonID17$ = _$PersonID17[0]) === null || _$PersonID17$ === void 0 ? void 0 : (_$PersonID17$$name = _$PersonID17$.name) === null || _$PersonID17$$name === void 0 ? void 0 : (_$PersonID17$$name$ = _$PersonID17$$name[0]) === null || _$PersonID17$$name$ === void 0 ? void 0 : _$PersonID17$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType5 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType5 !== void 0 ? _$appointmentType5 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
-              "View Patient": true,
-              "Attend": true
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId33 = _.appointmentId) === null || _$appointmentId33 === void 0 ? void 0 : (_$appointmentId33$ = _$appointmentId33[0]) === null || _$appointmentId33$ === void 0 ? void 0 : (_$appointmentId33$$Pe = _$appointmentId33$.PersonID) === null || _$appointmentId33$$Pe === void 0 ? void 0 : (_$appointmentId33$$Pe2 = _$appointmentId33$$Pe[0]) === null || _$appointmentId33$$Pe2 === void 0 ? void 0 : (_$appointmentId33$$Pe3 = _$appointmentId33$$Pe2.photo[0]) === null || _$appointmentId33$$Pe3 === void 0 ? void 0 : _$appointmentId33$$Pe3.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : (_$appointmentId34$$Pe = _$appointmentId34$.PersonID) === null || _$appointmentId34$$Pe === void 0 ? void 0 : (_$appointmentId34$$Pe2 = _$appointmentId34$$Pe[0]) === null || _$appointmentId34$$Pe2 === void 0 ? void 0 : (_$appointmentId34$$Pe3 = _$appointmentId34$$Pe2.photo[0]) === null || _$appointmentId34$$Pe3 === void 0 ? void 0 : _$appointmentId34$$Pe3.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id13 = _.patient_id) === null || _$patient_id13 === void 0 ? void 0 : (_$patient_id13$ = _$patient_id13[0]) === null || _$patient_id13$ === void 0 ? void 0 : (_$patient_id13$$name = _$patient_id13$.name) === null || _$patient_id13$$name === void 0 ? void 0 : _$patient_id13$$name[0]) || {}),
+              mrn: _ === null || _ === void 0 ? void 0 : (_$patient_id14 = _.patient_id) === null || _$patient_id14 === void 0 ? void 0 : (_$patient_id14$ = _$patient_id14[0]) === null || _$patient_id14$ === void 0 ? void 0 : _$patient_id14$.MRN,
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id15 = _.patient_id) === null || _$patient_id15 === void 0 ? void 0 : (_$patient_id15$ = _$patient_id15[0]) === null || _$patient_id15$ === void 0 ? void 0 : _$patient_id15$.age,
+              orderDate: (_ === null || _ === void 0 ? void 0 : (_$appointmentId35 = _.appointmentId) === null || _$appointmentId35 === void 0 ? void 0 : (_$appointmentId35$ = _$appointmentId35[0]) === null || _$appointmentId35$ === void 0 ? void 0 : _$appointmentId35$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.start).format("DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : (_$appointmentId37 = _.appointmentId) === null || _$appointmentId37 === void 0 ? void 0 : (_$appointmentId37$ = _$appointmentId37[0]) === null || _$appointmentId37$ === void 0 ? void 0 : _$appointmentId37$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId38 = _.appointmentId) === null || _$appointmentId38 === void 0 ? void 0 : (_$appointmentId38$ = _$appointmentId38[0]) === null || _$appointmentId38$ === void 0 ? void 0 : _$appointmentId38$.start).format("hh:mm A") : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId39 = _.appointmentId) === null || _$appointmentId39 === void 0 ? void 0 : (_$appointmentId39$ = _$appointmentId39[0]) === null || _$appointmentId39$ === void 0 ? void 0 : (_$appointmentId39$$Sp = _$appointmentId39$.SpecialtyID) === null || _$appointmentId39$$Sp === void 0 ? void 0 : _$appointmentId39$$Sp.map(function (spl) {
+                var _spl$coding11, _spl$coding11$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding11 = spl.coding) === null || _spl$coding11 === void 0 ? void 0 : (_spl$coding11$ = _spl$coding11[0]) === null || _spl$coding11$ === void 0 ? void 0 : _spl$coding11$.display;
+              }).join(", "),
+              ward: "Ward 1",
+              contact: JSON.stringify(_ === null || _ === void 0 ? void 0 : (_$patient_id16 = _.patient_id) === null || _$patient_id16 === void 0 ? void 0 : (_$patient_id16$ = _$patient_id16[0]) === null || _$patient_id16$ === void 0 ? void 0 : (_$patient_id16$$telec = _$patient_id16$.telecom) === null || _$patient_id16$$telec === void 0 ? void 0 : (_$patient_id16$$telec2 = _$patient_id16$$telec[0]) === null || _$patient_id16$$telec2 === void 0 ? void 0 : _$patient_id16$$telec2.value),
+              visittype: (_ === null || _ === void 0 ? void 0 : _.visit_type) || "",
+              encounterStatus: _ === null || _ === void 0 ? void 0 : (_$status5 = _.status) === null || _$status5 === void 0 ? void 0 : _$status5.display,
+              view: true
             };
           }) : [];
           return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38149,27 +38557,32 @@ var GET_WALK_INS_NURSE = createAsyncThunk("appointmentStatsApiSlice/getWalkInsNu
           _context12.prev = 2;
           _context12.next = 5;
           return fetchData$3({
-            body: query$4.getWalkInsNurse(payload)
+            body: JSON.stringify(query$4.getWalkInsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID18, _$PersonID18$, _$PersonID18$$name, _$PersonID18$$name$, _$appointmentType6;
+            var _$appointmentId40, _$appointmentId40$, _$appointmentId40$$Pe, _$appointmentId40$$Pe2, _$appointmentId40$$Pe3, _$appointmentId40$$Pe4, _$appointmentId41, _$appointmentId41$, _$appointmentId41$$Pe, _$appointmentId41$$Pe2, _$appointmentId41$$Pe3, _$appointmentId41$$Pe4, _$patient_id17, _$patient_id17$, _$patient_id17$$name, _$patient_id18, _$patient_id18$, _$patient_id19, _$patient_id19$, _$appointmentId42, _$appointmentId42$, _$appointmentId43, _$appointmentId43$, _$appointmentId44, _$appointmentId44$, _$appointmentId45, _$appointmentId45$, _$appointmentId46, _$appointmentId46$, _$visit_type5, _$appointmentId47, _$appointmentId47$, _$appointmentId47$$Sp, _$practitioner_detail9, _$practitioner_detail10, _$status6;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID18 = _.PersonID) === null || _$PersonID18 === void 0 ? void 0 : (_$PersonID18$ = _$PersonID18[0]) === null || _$PersonID18$ === void 0 ? void 0 : (_$PersonID18$$name = _$PersonID18$.name) === null || _$PersonID18$$name === void 0 ? void 0 : (_$PersonID18$$name$ = _$PersonID18$$name[0]) === null || _$PersonID18$$name$ === void 0 ? void 0 : _$PersonID18$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType6 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType6 !== void 0 ? _$appointmentType6 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId40 = _.appointmentId) === null || _$appointmentId40 === void 0 ? void 0 : (_$appointmentId40$ = _$appointmentId40[0]) === null || _$appointmentId40$ === void 0 ? void 0 : (_$appointmentId40$$Pe = _$appointmentId40$.PersonID) === null || _$appointmentId40$$Pe === void 0 ? void 0 : (_$appointmentId40$$Pe2 = _$appointmentId40$$Pe[0]) === null || _$appointmentId40$$Pe2 === void 0 ? void 0 : (_$appointmentId40$$Pe3 = _$appointmentId40$$Pe2.photo) === null || _$appointmentId40$$Pe3 === void 0 ? void 0 : (_$appointmentId40$$Pe4 = _$appointmentId40$$Pe3[0]) === null || _$appointmentId40$$Pe4 === void 0 ? void 0 : _$appointmentId40$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId41 = _.appointmentId) === null || _$appointmentId41 === void 0 ? void 0 : (_$appointmentId41$ = _$appointmentId41[0]) === null || _$appointmentId41$ === void 0 ? void 0 : (_$appointmentId41$$Pe = _$appointmentId41$.PersonID) === null || _$appointmentId41$$Pe === void 0 ? void 0 : (_$appointmentId41$$Pe2 = _$appointmentId41$$Pe[0]) === null || _$appointmentId41$$Pe2 === void 0 ? void 0 : (_$appointmentId41$$Pe3 = _$appointmentId41$$Pe2.photo) === null || _$appointmentId41$$Pe3 === void 0 ? void 0 : (_$appointmentId41$$Pe4 = _$appointmentId41$$Pe3[0]) === null || _$appointmentId41$$Pe4 === void 0 ? void 0 : _$appointmentId41$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id17 = _.patient_id) === null || _$patient_id17 === void 0 ? void 0 : (_$patient_id17$ = _$patient_id17[0]) === null || _$patient_id17$ === void 0 ? void 0 : (_$patient_id17$$name = _$patient_id17$.name) === null || _$patient_id17$$name === void 0 ? void 0 : _$patient_id17$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id18 = _.patient_id) === null || _$patient_id18 === void 0 ? void 0 : (_$patient_id18$ = _$patient_id18[0]) === null || _$patient_id18$ === void 0 ? void 0 : _$patient_id18$.alias) || "",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id19 = _.patient_id) === null || _$patient_id19 === void 0 ? void 0 : (_$patient_id19$ = _$patient_id19[0]) === null || _$patient_id19$ === void 0 ? void 0 : _$patient_id19$.age,
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId43 = _.appointmentId) === null || _$appointmentId43 === void 0 ? void 0 : (_$appointmentId43$ = _$appointmentId43[0]) === null || _$appointmentId43$ === void 0 ? void 0 : _$appointmentId43$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId45 = _.appointmentId) === null || _$appointmentId45 === void 0 ? void 0 : (_$appointmentId45$ = _$appointmentId45[0]) === null || _$appointmentId45$ === void 0 ? void 0 : _$appointmentId45$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId46 = _.appointmentId) === null || _$appointmentId46 === void 0 ? void 0 : (_$appointmentId46$ = _$appointmentId46[0]) === null || _$appointmentId46$ === void 0 ? void 0 : _$appointmentId46$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type5 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type5 !== void 0 ? _$visit_type5 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId47 = _.appointmentId) === null || _$appointmentId47 === void 0 ? void 0 : (_$appointmentId47$ = _$appointmentId47[0]) === null || _$appointmentId47$ === void 0 ? void 0 : (_$appointmentId47$$Sp = _$appointmentId47$.SpecialtyID) === null || _$appointmentId47$$Sp === void 0 ? void 0 : _$appointmentId47$$Sp.map(function (spl) {
+                var _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_detail9 = _.practitioner_details) === null || _$practitioner_detail9 === void 0 ? void 0 : (_$practitioner_detail10 = _$practitioner_detail9[0]) === null || _$practitioner_detail10 === void 0 ? void 0 : _$practitioner_detail10.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status6 = _.status) === null || _$status6 === void 0 ? void 0 : _$status6.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38209,27 +38622,31 @@ var GET_APPOINTMENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getAppo
           _context13.prev = 2;
           _context13.next = 5;
           return fetchData$3({
-            body: query$4.getAppointmentsDoctor(payload)
+            body: JSON.stringify(query$4.getAppointmentsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID19, _$PersonID19$, _$PersonID19$$name, _$PersonID19$$name$, _$appointmentType7;
+            var _$appointmentId48, _$appointmentId48$, _$appointmentId48$$Pe, _$appointmentId48$$Pe2, _$appointmentId48$$Pe3, _$appointmentId48$$Pe4, _$appointmentId49, _$appointmentId49$, _$appointmentId49$$Pe, _$appointmentId49$$Pe2, _$appointmentId49$$Pe3, _$appointmentId49$$Pe4, _$patient_id20, _$patient_id20$, _$patient_id20$$name, _$patient_id21, _$patient_id21$, _$appointmentId50, _$appointmentId50$, _$appointmentId51, _$appointmentId51$, _$appointmentId52, _$appointmentId52$, _$appointmentId53, _$appointmentId53$, _$appointmentId54, _$appointmentId54$, _$visit_type6, _$appointmentId55, _$appointmentId55$, _$appointmentId55$$Sp, _$practitioner_detail11, _$practitioner_detail12, _$status7;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID19 = _.PersonID) === null || _$PersonID19 === void 0 ? void 0 : (_$PersonID19$ = _$PersonID19[0]) === null || _$PersonID19$ === void 0 ? void 0 : (_$PersonID19$$name = _$PersonID19$.name) === null || _$PersonID19$$name === void 0 ? void 0 : (_$PersonID19$$name$ = _$PersonID19$$name[0]) === null || _$PersonID19$$name$ === void 0 ? void 0 : _$PersonID19$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType7 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType7 !== void 0 ? _$appointmentType7 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId48 = _.appointmentId) === null || _$appointmentId48 === void 0 ? void 0 : (_$appointmentId48$ = _$appointmentId48[0]) === null || _$appointmentId48$ === void 0 ? void 0 : (_$appointmentId48$$Pe = _$appointmentId48$.PersonID) === null || _$appointmentId48$$Pe === void 0 ? void 0 : (_$appointmentId48$$Pe2 = _$appointmentId48$$Pe[0]) === null || _$appointmentId48$$Pe2 === void 0 ? void 0 : (_$appointmentId48$$Pe3 = _$appointmentId48$$Pe2.photo) === null || _$appointmentId48$$Pe3 === void 0 ? void 0 : (_$appointmentId48$$Pe4 = _$appointmentId48$$Pe3[0]) === null || _$appointmentId48$$Pe4 === void 0 ? void 0 : _$appointmentId48$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId49 = _.appointmentId) === null || _$appointmentId49 === void 0 ? void 0 : (_$appointmentId49$ = _$appointmentId49[0]) === null || _$appointmentId49$ === void 0 ? void 0 : (_$appointmentId49$$Pe = _$appointmentId49$.PersonID) === null || _$appointmentId49$$Pe === void 0 ? void 0 : (_$appointmentId49$$Pe2 = _$appointmentId49$$Pe[0]) === null || _$appointmentId49$$Pe2 === void 0 ? void 0 : (_$appointmentId49$$Pe3 = _$appointmentId49$$Pe2.photo) === null || _$appointmentId49$$Pe3 === void 0 ? void 0 : (_$appointmentId49$$Pe4 = _$appointmentId49$$Pe3[0]) === null || _$appointmentId49$$Pe4 === void 0 ? void 0 : _$appointmentId49$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id20 = _.patient_id) === null || _$patient_id20 === void 0 ? void 0 : (_$patient_id20$ = _$patient_id20[0]) === null || _$patient_id20$ === void 0 ? void 0 : (_$patient_id20$$name = _$patient_id20$.name) === null || _$patient_id20$$name === void 0 ? void 0 : _$patient_id20$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id21 = _.patient_id) === null || _$patient_id21 === void 0 ? void 0 : (_$patient_id21$ = _$patient_id21[0]) === null || _$patient_id21$ === void 0 ? void 0 : _$patient_id21$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId51 = _.appointmentId) === null || _$appointmentId51 === void 0 ? void 0 : (_$appointmentId51$ = _$appointmentId51[0]) === null || _$appointmentId51$ === void 0 ? void 0 : _$appointmentId51$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId53 = _.appointmentId) === null || _$appointmentId53 === void 0 ? void 0 : (_$appointmentId53$ = _$appointmentId53[0]) === null || _$appointmentId53$ === void 0 ? void 0 : _$appointmentId53$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId54 = _.appointmentId) === null || _$appointmentId54 === void 0 ? void 0 : (_$appointmentId54$ = _$appointmentId54[0]) === null || _$appointmentId54$ === void 0 ? void 0 : _$appointmentId54$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type6 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type6 !== void 0 ? _$visit_type6 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId55 = _.appointmentId) === null || _$appointmentId55 === void 0 ? void 0 : (_$appointmentId55$ = _$appointmentId55[0]) === null || _$appointmentId55$ === void 0 ? void 0 : (_$appointmentId55$$Sp = _$appointmentId55$.SpecialtyID) === null || _$appointmentId55$$Sp === void 0 ? void 0 : _$appointmentId55$$Sp.map(function (spl) {
+                var _spl$coding13, _spl$coding13$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding13 = spl.coding) === null || _spl$coding13 === void 0 ? void 0 : (_spl$coding13$ = _spl$coding13[0]) === null || _spl$coding13$ === void 0 ? void 0 : _spl$coding13$.display;
+              }).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) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status7 = _.status) === null || _$status7 === void 0 ? void 0 : _$status7.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38268,27 +38685,31 @@ var GET_FIRST_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getFirs
           _context14.prev = 2;
           _context14.next = 5;
           return fetchData$3({
-            body: query$4.getFirstVisitsDoctor(payload)
+            body: JSON.stringify(query$4.getFirstVisitsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID20, _$PersonID20$, _$PersonID20$$name, _$PersonID20$$name$, _$appointmentType8;
+            var _$appointmentId56, _$appointmentId56$, _$appointmentId56$$Pe, _$appointmentId56$$Pe2, _$appointmentId56$$Pe3, _$appointmentId56$$Pe4, _$appointmentId57, _$appointmentId57$, _$appointmentId57$$Pe, _$appointmentId57$$Pe2, _$appointmentId57$$Pe3, _$appointmentId57$$Pe4, _$patient_id22, _$patient_id22$, _$patient_id22$$name, _$patient_id23, _$patient_id23$, _$appointmentId58, _$appointmentId58$, _$appointmentId59, _$appointmentId59$, _$appointmentId60, _$appointmentId60$, _$appointmentId61, _$appointmentId61$, _$appointmentId62, _$appointmentId62$, _$visit_type7, _$appointmentId63, _$appointmentId63$, _$appointmentId63$$Sp, _$practitioner_detail13, _$practitioner_detail14, _$status8;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID20 = _.PersonID) === null || _$PersonID20 === void 0 ? void 0 : (_$PersonID20$ = _$PersonID20[0]) === null || _$PersonID20$ === void 0 ? void 0 : (_$PersonID20$$name = _$PersonID20$.name) === null || _$PersonID20$$name === void 0 ? void 0 : (_$PersonID20$$name$ = _$PersonID20$$name[0]) === null || _$PersonID20$$name$ === void 0 ? void 0 : _$PersonID20$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType8 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType8 !== void 0 ? _$appointmentType8 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId56 = _.appointmentId) === null || _$appointmentId56 === void 0 ? void 0 : (_$appointmentId56$ = _$appointmentId56[0]) === null || _$appointmentId56$ === void 0 ? void 0 : (_$appointmentId56$$Pe = _$appointmentId56$.PersonID) === null || _$appointmentId56$$Pe === void 0 ? void 0 : (_$appointmentId56$$Pe2 = _$appointmentId56$$Pe[0]) === null || _$appointmentId56$$Pe2 === void 0 ? void 0 : (_$appointmentId56$$Pe3 = _$appointmentId56$$Pe2.photo) === null || _$appointmentId56$$Pe3 === void 0 ? void 0 : (_$appointmentId56$$Pe4 = _$appointmentId56$$Pe3[0]) === null || _$appointmentId56$$Pe4 === void 0 ? void 0 : _$appointmentId56$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId57 = _.appointmentId) === null || _$appointmentId57 === void 0 ? void 0 : (_$appointmentId57$ = _$appointmentId57[0]) === null || _$appointmentId57$ === void 0 ? void 0 : (_$appointmentId57$$Pe = _$appointmentId57$.PersonID) === null || _$appointmentId57$$Pe === void 0 ? void 0 : (_$appointmentId57$$Pe2 = _$appointmentId57$$Pe[0]) === null || _$appointmentId57$$Pe2 === void 0 ? void 0 : (_$appointmentId57$$Pe3 = _$appointmentId57$$Pe2.photo) === null || _$appointmentId57$$Pe3 === void 0 ? void 0 : (_$appointmentId57$$Pe4 = _$appointmentId57$$Pe3[0]) === null || _$appointmentId57$$Pe4 === void 0 ? void 0 : _$appointmentId57$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id22 = _.patient_id) === null || _$patient_id22 === void 0 ? void 0 : (_$patient_id22$ = _$patient_id22[0]) === null || _$patient_id22$ === void 0 ? void 0 : (_$patient_id22$$name = _$patient_id22$.name) === null || _$patient_id22$$name === void 0 ? void 0 : _$patient_id22$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id23 = _.patient_id) === null || _$patient_id23 === void 0 ? void 0 : (_$patient_id23$ = _$patient_id23[0]) === null || _$patient_id23$ === void 0 ? void 0 : _$patient_id23$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId59 = _.appointmentId) === null || _$appointmentId59 === void 0 ? void 0 : (_$appointmentId59$ = _$appointmentId59[0]) === null || _$appointmentId59$ === void 0 ? void 0 : _$appointmentId59$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId61 = _.appointmentId) === null || _$appointmentId61 === void 0 ? void 0 : (_$appointmentId61$ = _$appointmentId61[0]) === null || _$appointmentId61$ === void 0 ? void 0 : _$appointmentId61$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId62 = _.appointmentId) === null || _$appointmentId62 === void 0 ? void 0 : (_$appointmentId62$ = _$appointmentId62[0]) === null || _$appointmentId62$ === void 0 ? void 0 : _$appointmentId62$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type7 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type7 !== void 0 ? _$visit_type7 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId63 = _.appointmentId) === null || _$appointmentId63 === void 0 ? void 0 : (_$appointmentId63$ = _$appointmentId63[0]) === null || _$appointmentId63$ === void 0 ? void 0 : (_$appointmentId63$$Sp = _$appointmentId63$.SpecialtyID) === null || _$appointmentId63$$Sp === void 0 ? void 0 : _$appointmentId63$$Sp.map(function (spl) {
+                var _spl$coding14, _spl$coding14$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding14 = spl.coding) === null || _spl$coding14 === void 0 ? void 0 : (_spl$coding14$ = _spl$coding14[0]) === null || _spl$coding14$ === void 0 ? void 0 : _spl$coding14$.display;
+              }).join(", "),
+              clinic: (_ === null || _ === void 0 ? void 0 : (_$practitioner_detail13 = _.practitioner_details) === null || _$practitioner_detail13 === void 0 ? void 0 : (_$practitioner_detail14 = _$practitioner_detail13[0]) === null || _$practitioner_detail14 === void 0 ? void 0 : _$practitioner_detail14.clinic) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status8 = _.status) === null || _$status8 === void 0 ? void 0 : _$status8.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38327,27 +38748,31 @@ var GET_NEW_PATIENTS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getNewP
           _context15.prev = 2;
           _context15.next = 5;
           return fetchData$3({
-            body: query$4.getNewPatientsDoctor(payload)
+            body: JSON.stringify(query$4.getNewPatientsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID21, _$PersonID21$, _$PersonID21$$name, _$PersonID21$$name$, _$appointmentType9;
+            var _$appointmentId64, _$appointmentId64$, _$appointmentId64$$Pe, _$appointmentId64$$Pe2, _$appointmentId64$$Pe3, _$appointmentId64$$Pe4, _$appointmentId65, _$appointmentId65$, _$appointmentId65$$Pe, _$appointmentId65$$Pe2, _$appointmentId65$$Pe3, _$appointmentId65$$Pe4, _$patient_id24, _$patient_id24$, _$patient_id24$$name, _$patient_id25, _$patient_id25$, _$appointmentId66, _$appointmentId66$, _$appointmentId67, _$appointmentId67$, _$appointmentId68, _$appointmentId68$, _$appointmentId69, _$appointmentId69$, _$appointmentId70, _$appointmentId70$, _$visit_type8, _$appointmentId71, _$appointmentId71$, _$appointmentId71$$Sp, _$practitioner_detail15, _$practitioner_detail16, _$status9;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID21 = _.PersonID) === null || _$PersonID21 === void 0 ? void 0 : (_$PersonID21$ = _$PersonID21[0]) === null || _$PersonID21$ === void 0 ? void 0 : (_$PersonID21$$name = _$PersonID21$.name) === null || _$PersonID21$$name === void 0 ? void 0 : (_$PersonID21$$name$ = _$PersonID21$$name[0]) === null || _$PersonID21$$name$ === void 0 ? void 0 : _$PersonID21$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType9 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType9 !== void 0 ? _$appointmentType9 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId64 = _.appointmentId) === null || _$appointmentId64 === void 0 ? void 0 : (_$appointmentId64$ = _$appointmentId64[0]) === null || _$appointmentId64$ === void 0 ? void 0 : (_$appointmentId64$$Pe = _$appointmentId64$.PersonID) === null || _$appointmentId64$$Pe === void 0 ? void 0 : (_$appointmentId64$$Pe2 = _$appointmentId64$$Pe[0]) === null || _$appointmentId64$$Pe2 === void 0 ? void 0 : (_$appointmentId64$$Pe3 = _$appointmentId64$$Pe2.photo) === null || _$appointmentId64$$Pe3 === void 0 ? void 0 : (_$appointmentId64$$Pe4 = _$appointmentId64$$Pe3[0]) === null || _$appointmentId64$$Pe4 === void 0 ? void 0 : _$appointmentId64$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId65 = _.appointmentId) === null || _$appointmentId65 === void 0 ? void 0 : (_$appointmentId65$ = _$appointmentId65[0]) === null || _$appointmentId65$ === void 0 ? void 0 : (_$appointmentId65$$Pe = _$appointmentId65$.PersonID) === null || _$appointmentId65$$Pe === void 0 ? void 0 : (_$appointmentId65$$Pe2 = _$appointmentId65$$Pe[0]) === null || _$appointmentId65$$Pe2 === void 0 ? void 0 : (_$appointmentId65$$Pe3 = _$appointmentId65$$Pe2.photo) === null || _$appointmentId65$$Pe3 === void 0 ? void 0 : (_$appointmentId65$$Pe4 = _$appointmentId65$$Pe3[0]) === null || _$appointmentId65$$Pe4 === void 0 ? void 0 : _$appointmentId65$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id24 = _.patient_id) === null || _$patient_id24 === void 0 ? void 0 : (_$patient_id24$ = _$patient_id24[0]) === null || _$patient_id24$ === void 0 ? void 0 : (_$patient_id24$$name = _$patient_id24$.name) === null || _$patient_id24$$name === void 0 ? void 0 : _$patient_id24$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id25 = _.patient_id) === null || _$patient_id25 === void 0 ? void 0 : (_$patient_id25$ = _$patient_id25[0]) === null || _$patient_id25$ === void 0 ? void 0 : _$patient_id25$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : _$appointmentId66$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId67 = _.appointmentId) === null || _$appointmentId67 === void 0 ? void 0 : (_$appointmentId67$ = _$appointmentId67[0]) === null || _$appointmentId67$ === void 0 ? void 0 : _$appointmentId67$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId68 = _.appointmentId) === null || _$appointmentId68 === void 0 ? void 0 : (_$appointmentId68$ = _$appointmentId68[0]) === null || _$appointmentId68$ === void 0 ? void 0 : _$appointmentId68$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId69 = _.appointmentId) === null || _$appointmentId69 === void 0 ? void 0 : (_$appointmentId69$ = _$appointmentId69[0]) === null || _$appointmentId69$ === void 0 ? void 0 : _$appointmentId69$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId70 = _.appointmentId) === null || _$appointmentId70 === void 0 ? void 0 : (_$appointmentId70$ = _$appointmentId70[0]) === null || _$appointmentId70$ === void 0 ? void 0 : _$appointmentId70$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type8 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type8 !== void 0 ? _$visit_type8 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId71 = _.appointmentId) === null || _$appointmentId71 === void 0 ? void 0 : (_$appointmentId71$ = _$appointmentId71[0]) === null || _$appointmentId71$ === void 0 ? void 0 : (_$appointmentId71$$Sp = _$appointmentId71$.SpecialtyID) === null || _$appointmentId71$$Sp === void 0 ? void 0 : _$appointmentId71$$Sp.map(function (spl) {
+                var _spl$coding15, _spl$coding15$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding15 = spl.coding) === null || _spl$coding15 === void 0 ? void 0 : (_spl$coding15$ = _spl$coding15[0]) === null || _spl$coding15$ === void 0 ? void 0 : _spl$coding15$.display;
+              }).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) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status9 = _.status) === null || _$status9 === void 0 ? void 0 : _$status9.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context15.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38386,27 +38811,31 @@ var GET_OTHER_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getOthe
           _context16.prev = 2;
           _context16.next = 5;
           return fetchData$3({
-            body: query$4.getOtherVisitsDoctor(payload)
+            body: JSON.stringify(query$4.getOtherVisitsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID22, _$PersonID22$, _$PersonID22$$name, _$PersonID22$$name$, _$appointmentType10;
+            var _$appointmentId72, _$appointmentId72$, _$appointmentId72$$Pe, _$appointmentId72$$Pe2, _$appointmentId72$$Pe3, _$appointmentId72$$Pe4, _$appointmentId73, _$appointmentId73$, _$appointmentId73$$Pe, _$appointmentId73$$Pe2, _$appointmentId73$$Pe3, _$appointmentId73$$Pe4, _$patient_id26, _$patient_id26$, _$patient_id26$$name, _$patient_id27, _$patient_id27$, _$appointmentId74, _$appointmentId74$, _$appointmentId75, _$appointmentId75$, _$appointmentId76, _$appointmentId76$, _$appointmentId77, _$appointmentId77$, _$appointmentId78, _$appointmentId78$, _$visit_type9, _$appointmentId79, _$appointmentId79$, _$appointmentId79$$Sp, _$practitioner_detail17, _$practitioner_detail18, _$status10;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID22 = _.PersonID) === null || _$PersonID22 === void 0 ? void 0 : (_$PersonID22$ = _$PersonID22[0]) === null || _$PersonID22$ === void 0 ? void 0 : (_$PersonID22$$name = _$PersonID22$.name) === null || _$PersonID22$$name === void 0 ? void 0 : (_$PersonID22$$name$ = _$PersonID22$$name[0]) === null || _$PersonID22$$name$ === void 0 ? void 0 : _$PersonID22$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType10 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType10 !== void 0 ? _$appointmentType10 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId72 = _.appointmentId) === null || _$appointmentId72 === void 0 ? void 0 : (_$appointmentId72$ = _$appointmentId72[0]) === null || _$appointmentId72$ === void 0 ? void 0 : (_$appointmentId72$$Pe = _$appointmentId72$.PersonID) === null || _$appointmentId72$$Pe === void 0 ? void 0 : (_$appointmentId72$$Pe2 = _$appointmentId72$$Pe[0]) === null || _$appointmentId72$$Pe2 === void 0 ? void 0 : (_$appointmentId72$$Pe3 = _$appointmentId72$$Pe2.photo) === null || _$appointmentId72$$Pe3 === void 0 ? void 0 : (_$appointmentId72$$Pe4 = _$appointmentId72$$Pe3[0]) === null || _$appointmentId72$$Pe4 === void 0 ? void 0 : _$appointmentId72$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId73 = _.appointmentId) === null || _$appointmentId73 === void 0 ? void 0 : (_$appointmentId73$ = _$appointmentId73[0]) === null || _$appointmentId73$ === void 0 ? void 0 : (_$appointmentId73$$Pe = _$appointmentId73$.PersonID) === null || _$appointmentId73$$Pe === void 0 ? void 0 : (_$appointmentId73$$Pe2 = _$appointmentId73$$Pe[0]) === null || _$appointmentId73$$Pe2 === void 0 ? void 0 : (_$appointmentId73$$Pe3 = _$appointmentId73$$Pe2.photo) === null || _$appointmentId73$$Pe3 === void 0 ? void 0 : (_$appointmentId73$$Pe4 = _$appointmentId73$$Pe3[0]) === null || _$appointmentId73$$Pe4 === void 0 ? void 0 : _$appointmentId73$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id26 = _.patient_id) === null || _$patient_id26 === void 0 ? void 0 : (_$patient_id26$ = _$patient_id26[0]) === null || _$patient_id26$ === void 0 ? void 0 : (_$patient_id26$$name = _$patient_id26$.name) === null || _$patient_id26$$name === void 0 ? void 0 : _$patient_id26$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id27 = _.patient_id) === null || _$patient_id27 === void 0 ? void 0 : (_$patient_id27$ = _$patient_id27[0]) === null || _$patient_id27$ === void 0 ? void 0 : _$patient_id27$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId74 = _.appointmentId) === null || _$appointmentId74 === void 0 ? void 0 : (_$appointmentId74$ = _$appointmentId74[0]) === null || _$appointmentId74$ === void 0 ? void 0 : _$appointmentId74$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId75 = _.appointmentId) === null || _$appointmentId75 === void 0 ? void 0 : (_$appointmentId75$ = _$appointmentId75[0]) === null || _$appointmentId75$ === void 0 ? void 0 : _$appointmentId75$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId76 = _.appointmentId) === null || _$appointmentId76 === void 0 ? void 0 : (_$appointmentId76$ = _$appointmentId76[0]) === null || _$appointmentId76$ === void 0 ? void 0 : _$appointmentId76$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId77 = _.appointmentId) === null || _$appointmentId77 === void 0 ? void 0 : (_$appointmentId77$ = _$appointmentId77[0]) === null || _$appointmentId77$ === void 0 ? void 0 : _$appointmentId77$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId78 = _.appointmentId) === null || _$appointmentId78 === void 0 ? void 0 : (_$appointmentId78$ = _$appointmentId78[0]) === null || _$appointmentId78$ === void 0 ? void 0 : _$appointmentId78$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type9 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type9 !== void 0 ? _$visit_type9 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId79 = _.appointmentId) === null || _$appointmentId79 === void 0 ? void 0 : (_$appointmentId79$ = _$appointmentId79[0]) === null || _$appointmentId79$ === void 0 ? void 0 : (_$appointmentId79$$Sp = _$appointmentId79$.SpecialtyID) === null || _$appointmentId79$$Sp === void 0 ? void 0 : _$appointmentId79$$Sp.map(function (spl) {
+                var _spl$coding16, _spl$coding16$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding16 = spl.coding) === null || _spl$coding16 === void 0 ? void 0 : (_spl$coding16$ = _spl$coding16[0]) === null || _spl$coding16$ === void 0 ? void 0 : _spl$coding16$.display;
+              }).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) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status10 = _.status) === null || _$status10 === void 0 ? void 0 : _$status10.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38445,27 +38874,31 @@ var GET_TODAY_VISITS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getToda
           _context17.prev = 2;
           _context17.next = 5;
           return fetchData$3({
-            body: query$4.getTodayVisitsDoctor(payload)
+            body: JSON.stringify(query$4.getTodayVisitsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID23, _$PersonID23$, _$PersonID23$$name, _$PersonID23$$name$, _$appointmentType11;
+            var _$appointmentId80, _$appointmentId80$, _$appointmentId80$$Pe, _$appointmentId80$$Pe2, _$appointmentId80$$Pe3, _$appointmentId80$$Pe4, _$appointmentId81, _$appointmentId81$, _$appointmentId81$$Pe, _$appointmentId81$$Pe2, _$appointmentId81$$Pe3, _$appointmentId81$$Pe4, _$patient_id28, _$patient_id28$, _$patient_id28$$name, _$patient_id29, _$patient_id29$, _$appointmentId82, _$appointmentId82$, _$appointmentId83, _$appointmentId83$, _$appointmentId84, _$appointmentId84$, _$appointmentId85, _$appointmentId85$, _$appointmentId86, _$appointmentId86$, _$visit_type10, _$appointmentId87, _$appointmentId87$, _$appointmentId87$$Sp, _$practitioner_detail19, _$practitioner_detail20, _$status11;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID23 = _.PersonID) === null || _$PersonID23 === void 0 ? void 0 : (_$PersonID23$ = _$PersonID23[0]) === null || _$PersonID23$ === void 0 ? void 0 : (_$PersonID23$$name = _$PersonID23$.name) === null || _$PersonID23$$name === void 0 ? void 0 : (_$PersonID23$$name$ = _$PersonID23$$name[0]) === null || _$PersonID23$$name$ === void 0 ? void 0 : _$PersonID23$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType11 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType11 !== void 0 ? _$appointmentType11 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId80 = _.appointmentId) === null || _$appointmentId80 === void 0 ? void 0 : (_$appointmentId80$ = _$appointmentId80[0]) === null || _$appointmentId80$ === void 0 ? void 0 : (_$appointmentId80$$Pe = _$appointmentId80$.PersonID) === null || _$appointmentId80$$Pe === void 0 ? void 0 : (_$appointmentId80$$Pe2 = _$appointmentId80$$Pe[0]) === null || _$appointmentId80$$Pe2 === void 0 ? void 0 : (_$appointmentId80$$Pe3 = _$appointmentId80$$Pe2.photo) === null || _$appointmentId80$$Pe3 === void 0 ? void 0 : (_$appointmentId80$$Pe4 = _$appointmentId80$$Pe3[0]) === null || _$appointmentId80$$Pe4 === void 0 ? void 0 : _$appointmentId80$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId81 = _.appointmentId) === null || _$appointmentId81 === void 0 ? void 0 : (_$appointmentId81$ = _$appointmentId81[0]) === null || _$appointmentId81$ === void 0 ? void 0 : (_$appointmentId81$$Pe = _$appointmentId81$.PersonID) === null || _$appointmentId81$$Pe === void 0 ? void 0 : (_$appointmentId81$$Pe2 = _$appointmentId81$$Pe[0]) === null || _$appointmentId81$$Pe2 === void 0 ? void 0 : (_$appointmentId81$$Pe3 = _$appointmentId81$$Pe2.photo) === null || _$appointmentId81$$Pe3 === void 0 ? void 0 : (_$appointmentId81$$Pe4 = _$appointmentId81$$Pe3[0]) === null || _$appointmentId81$$Pe4 === void 0 ? void 0 : _$appointmentId81$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id28 = _.patient_id) === null || _$patient_id28 === void 0 ? void 0 : (_$patient_id28$ = _$patient_id28[0]) === null || _$patient_id28$ === void 0 ? void 0 : (_$patient_id28$$name = _$patient_id28$.name) === null || _$patient_id28$$name === void 0 ? void 0 : _$patient_id28$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id29 = _.patient_id) === null || _$patient_id29 === void 0 ? void 0 : (_$patient_id29$ = _$patient_id29[0]) === null || _$patient_id29$ === void 0 ? void 0 : _$patient_id29$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId82 = _.appointmentId) === null || _$appointmentId82 === void 0 ? void 0 : (_$appointmentId82$ = _$appointmentId82[0]) === null || _$appointmentId82$ === void 0 ? void 0 : _$appointmentId82$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId83 = _.appointmentId) === null || _$appointmentId83 === void 0 ? void 0 : (_$appointmentId83$ = _$appointmentId83[0]) === null || _$appointmentId83$ === void 0 ? void 0 : _$appointmentId83$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId84 = _.appointmentId) === null || _$appointmentId84 === void 0 ? void 0 : (_$appointmentId84$ = _$appointmentId84[0]) === null || _$appointmentId84$ === void 0 ? void 0 : _$appointmentId84$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId85 = _.appointmentId) === null || _$appointmentId85 === void 0 ? void 0 : (_$appointmentId85$ = _$appointmentId85[0]) === null || _$appointmentId85$ === void 0 ? void 0 : _$appointmentId85$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId86 = _.appointmentId) === null || _$appointmentId86 === void 0 ? void 0 : (_$appointmentId86$ = _$appointmentId86[0]) === null || _$appointmentId86$ === void 0 ? void 0 : _$appointmentId86$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type10 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type10 !== void 0 ? _$visit_type10 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId87 = _.appointmentId) === null || _$appointmentId87 === void 0 ? void 0 : (_$appointmentId87$ = _$appointmentId87[0]) === null || _$appointmentId87$ === void 0 ? void 0 : (_$appointmentId87$$Sp = _$appointmentId87$.SpecialtyID) === null || _$appointmentId87$$Sp === void 0 ? void 0 : _$appointmentId87$$Sp.map(function (spl) {
+                var _spl$coding17, _spl$coding17$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding17 = spl.coding) === null || _spl$coding17 === void 0 ? void 0 : (_spl$coding17$ = _spl$coding17[0]) === null || _spl$coding17$ === void 0 ? void 0 : _spl$coding17$.display;
+              }).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) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status11 = _.status) === null || _$status11 === void 0 ? void 0 : _$status11.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -38504,27 +38937,31 @@ var GET_WALK_INS_DOCTOR = createAsyncThunk("appointmentStatsApiSlice/getWalkInsD
           _context18.prev = 2;
           _context18.next = 5;
           return fetchData$3({
-            body: query$4.getWalkInsDoctor(payload)
+            body: JSON.stringify(query$4.getWalkInsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID24, _$PersonID24$, _$PersonID24$$name, _$PersonID24$$name$, _$appointmentType12;
+            var _$appointmentId88, _$appointmentId88$, _$appointmentId88$$Pe, _$appointmentId88$$Pe2, _$appointmentId88$$Pe3, _$appointmentId88$$Pe4, _$appointmentId89, _$appointmentId89$, _$appointmentId89$$Pe, _$appointmentId89$$Pe2, _$appointmentId89$$Pe3, _$appointmentId89$$Pe4, _$patient_id30, _$patient_id30$, _$patient_id30$$name, _$patient_id31, _$patient_id31$, _$appointmentId90, _$appointmentId90$, _$appointmentId91, _$appointmentId91$, _$appointmentId92, _$appointmentId92$, _$appointmentId93, _$appointmentId93$, _$appointmentId94, _$appointmentId94$, _$visit_type11, _$appointmentId95, _$appointmentId95$, _$appointmentId95$$Sp, _$practitioner_detail21, _$practitioner_detail22, _$status12;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID24 = _.PersonID) === null || _$PersonID24 === void 0 ? void 0 : (_$PersonID24$ = _$PersonID24[0]) === null || _$PersonID24$ === void 0 ? void 0 : (_$PersonID24$$name = _$PersonID24$.name) === null || _$PersonID24$$name === void 0 ? void 0 : (_$PersonID24$$name$ = _$PersonID24$$name[0]) === null || _$PersonID24$$name$ === void 0 ? void 0 : _$PersonID24$$name$.given,
-              "mrn": 'MRN',
-              "refNo": "Ref No",
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visitType": (_$appointmentType12 = _ === null || _ === void 0 ? void 0 : _.appointmentType) !== null && _$appointmentType12 !== void 0 ? _$appointmentType12 : '',
-              "speciality": 'Speciality',
-              "clinic": 'Clinic',
-              "appointmentStatus": 'Status',
+              img: (_ === null || _ === void 0 ? void 0 : (_$appointmentId88 = _.appointmentId) === null || _$appointmentId88 === void 0 ? void 0 : (_$appointmentId88$ = _$appointmentId88[0]) === null || _$appointmentId88$ === void 0 ? void 0 : (_$appointmentId88$$Pe = _$appointmentId88$.PersonID) === null || _$appointmentId88$$Pe === void 0 ? void 0 : (_$appointmentId88$$Pe2 = _$appointmentId88$$Pe[0]) === null || _$appointmentId88$$Pe2 === void 0 ? void 0 : (_$appointmentId88$$Pe3 = _$appointmentId88$$Pe2.photo) === null || _$appointmentId88$$Pe3 === void 0 ? void 0 : (_$appointmentId88$$Pe4 = _$appointmentId88$$Pe3[0]) === null || _$appointmentId88$$Pe4 === void 0 ? void 0 : _$appointmentId88$$Pe4.fileid) ? getImgUrl(_ === null || _ === void 0 ? void 0 : (_$appointmentId89 = _.appointmentId) === null || _$appointmentId89 === void 0 ? void 0 : (_$appointmentId89$ = _$appointmentId89[0]) === null || _$appointmentId89$ === void 0 ? void 0 : (_$appointmentId89$$Pe = _$appointmentId89$.PersonID) === null || _$appointmentId89$$Pe === void 0 ? void 0 : (_$appointmentId89$$Pe2 = _$appointmentId89$$Pe[0]) === null || _$appointmentId89$$Pe2 === void 0 ? void 0 : (_$appointmentId89$$Pe3 = _$appointmentId89$$Pe2.photo) === null || _$appointmentId89$$Pe3 === void 0 ? void 0 : (_$appointmentId89$$Pe4 = _$appointmentId89$$Pe3[0]) === null || _$appointmentId89$$Pe4 === void 0 ? void 0 : _$appointmentId89$$Pe4.fileid) : "https://worthingtonmotorcycles.com.au/wp-content/uploads/2017/06/tlc-perth-user-icon-im2.png",
+              name: makeName((_ === null || _ === void 0 ? void 0 : (_$patient_id30 = _.patient_id) === null || _$patient_id30 === void 0 ? void 0 : (_$patient_id30$ = _$patient_id30[0]) === null || _$patient_id30$ === void 0 ? void 0 : (_$patient_id30$$name = _$patient_id30$.name) === null || _$patient_id30$$name === void 0 ? void 0 : _$patient_id30$$name[0]) || {}),
+              mrn: (_ === null || _ === void 0 ? void 0 : (_$patient_id31 = _.patient_id) === null || _$patient_id31 === void 0 ? void 0 : (_$patient_id31$ = _$patient_id31[0]) === null || _$patient_id31$ === void 0 ? void 0 : _$patient_id31$.MRN) || "",
+              refNo: (_ === null || _ === void 0 ? void 0 : (_$appointmentId90 = _.appointmentId) === null || _$appointmentId90 === void 0 ? void 0 : (_$appointmentId90$ = _$appointmentId90[0]) === null || _$appointmentId90$ === void 0 ? void 0 : _$appointmentId90$.appno) || "",
+              date: (_ === null || _ === void 0 ? void 0 : (_$appointmentId91 = _.appointmentId) === null || _$appointmentId91 === void 0 ? void 0 : (_$appointmentId91$ = _$appointmentId91[0]) === null || _$appointmentId91$ === void 0 ? void 0 : _$appointmentId91$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId92 = _.appointmentId) === null || _$appointmentId92 === void 0 ? void 0 : (_$appointmentId92$ = _$appointmentId92[0]) === null || _$appointmentId92$ === void 0 ? void 0 : _$appointmentId92$.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : (_$appointmentId93 = _.appointmentId) === null || _$appointmentId93 === void 0 ? void 0 : (_$appointmentId93$ = _$appointmentId93[0]) === null || _$appointmentId93$ === void 0 ? void 0 : _$appointmentId93$.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId94 = _.appointmentId) === null || _$appointmentId94 === void 0 ? void 0 : (_$appointmentId94$ = _$appointmentId94[0]) === null || _$appointmentId94$ === void 0 ? void 0 : _$appointmentId94$.start).format("hh:mm A") : "",
+              visitType: (_$visit_type11 = _ === null || _ === void 0 ? void 0 : _.visit_type) !== null && _$visit_type11 !== void 0 ? _$visit_type11 : "",
+              speciality: _ === null || _ === void 0 ? void 0 : (_$appointmentId95 = _.appointmentId) === null || _$appointmentId95 === void 0 ? void 0 : (_$appointmentId95$ = _$appointmentId95[0]) === null || _$appointmentId95$ === void 0 ? void 0 : (_$appointmentId95$$Sp = _$appointmentId95$.SpecialtyID) === null || _$appointmentId95$$Sp === void 0 ? void 0 : _$appointmentId95$$Sp.map(function (spl) {
+                var _spl$coding18, _spl$coding18$;
+
+                return spl === null || spl === void 0 ? void 0 : (_spl$coding18 = spl.coding) === null || _spl$coding18 === void 0 ? void 0 : (_spl$coding18$ = _spl$coding18[0]) === null || _spl$coding18$ === void 0 ? void 0 : _spl$coding18$.display;
+              }).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) || "",
+              appointmentStatus: (_ === null || _ === void 0 ? void 0 : (_$status12 = _.status) === null || _$status12 === void 0 ? void 0 : _$status12.display) || "",
               "View Patient": true,
-              "Attend": true
+              Attend: true
             };
           }) : [];
           return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39025,12 +39462,11 @@ var ALERT_INTERACTIONS_UPERT = createAsyncThunk("alertIntractionsSlice/alertInte
         case 11:
           _context2.prev = 11;
           _context2.t0 = _context2["catch"](2);
-          debugger;
           return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context2.t0.message
           })));
 
-        case 15:
+        case 14:
         case "end":
           return _context2.stop();
       }
@@ -39793,42 +40229,100 @@ 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.orgID, "' && 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(document(Encounter.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))}))})\"\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 {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\": \"Practitioner,Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && 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(document(Encounter.status).display)=='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))}))})\"\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 {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\": \"Practitioner,Encounter\",\n        \"filter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && 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(document(Encounter.status).display)=='finished'\",\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))}))})\"\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 {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.orgID, "' && Appointment.start<=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end>=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.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      }");
+    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      }");
   },
   //NURSE
   getPatientsCheckedInNurse: function getPatientsCheckedInNurse(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Practitioner,Encounter\",\n        \"filter\": {\n          \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(document(Encounter.status).display)=='checked-in'\"\n        },\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))}))})\"\n      }");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Encounter",
+      filter: {
+        Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " &&  DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'")
+      },
+      return_fields: "merge(Encounter,{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)}))}))})"
+    };
   },
   getVisitCompletedNurse: function getVisitCompletedNurse(data) {
-    return "{\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Practitioner,Encounter\",\n          \"filter\": {\n            \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n            \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(document(Encounter.status).display)=='finished'\"\n          },\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))}))})\"\n        }");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Encounter",
+      filter: {
+        Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010'")
+      },
+      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)}))}))})"
+    };
   },
   getPatientsNoShowsNurse: function getPatientsNoShowsNurse(data) {
-    return "{\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Appointment\",\n          \"filter\": \"Appointment.activestatus==true && Appointment.start<=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end>=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.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        }");
+    return {
+      "db_name": dbName,
+      "entity": "Appointment",
+      "filter": "Appointment.activestatus==true && Appointment.start<=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end>=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appstatus)=='booked' && ((DATE_TIMESTAMP(DATE_NOW()/1000)-Appointment.end)/60)>30"),
+      "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)}))}))})"
+    };
   },
   getTriageDoneNurse: function getTriageDoneNurse(data) {
-    return "{\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Practitioner,Encounter\",\n          \"filter\": {\n            \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n            \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(document(Encounter.status).display)=='triaged'\"\n          },\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))}))})\"\n        }");
+    return {
+      db_name: dbName,
+      entity: "Practitioner,Encounter",
+      filter: {
+        Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'"),
+        Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(data === null || data === void 0 ? void 0 : data.orgIdInt, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Encounter.encounterdate<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Triaged'")
+      },
+      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)}))}))})"
+    };
   },
   //DOCTOR
   getPatientsNoShowsDoctor: function getPatientsNoShowsDoctor(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Appointment\",\n        \"filter\": \"Appointment.activestatus==true && Appointment.start<=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end>=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.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      }");
+    return {
+      "db_name": dbName,
+      "entity": "Appointment",
+      "filter": "Appointment.activestatus==true && Appointment.start<=".concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end>=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appstatus)=='booked' && ((DATE_TIMESTAMP(DATE_NOW()/1000)-Appointment.end)/60)>30"),
+      "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)}))}))})"
+    };
   },
   getPatientsCheckedInDoctor: function getPatientsCheckedInDoctor(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Practitioner,Encounter\",\n        \"filter\": {\n          \"Practitioner\": \"Practitioner.activestatus==true && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Encounter.participant[*].Practitioner_id any == Practitioner.id && 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(document(Encounter.status).display)=='checked-in'\"\n        },\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))}))})\"\n      }");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, "  && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled'  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' "),
+        Encounter: "Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getVisitCompletedDoctor: function getVisitCompletedDoctor(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Practitioner,Encounter\",\n        \"filter\": {\n          \"Practitioner\": \"Practitioner.activestatus==true && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Encounter.participant[*].Practitioner_id any == Practitioner.id && 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(document(Encounter.status).display)=='finished'\"\n        },\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))}))})\"\n      }");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, "  && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' "),
+        Encounter: "Appointment.id in Encounter.appointmentId &&  document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010'"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   },
   getTriageDoneDoctor: function getTriageDoneDoctor(data) {
-    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"Practitioner,Encounter\",\n        \"filter\": {\n          \"Practitioner\": \"Practitioner.activestatus==true && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"Encounter\": \"Encounter.activestatus == true && Encounter.Organization_id == '").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Encounter.participant[*].Practitioner_id any == Practitioner.id && 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(document(Encounter.status).display)=='triaged'\"\n        },\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))}))})\"\n      }");
+    return {
+      db_name: dbName,
+      entity: "Appointment,Encounter",
+      filter: {
+        Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(data === null || data === void 0 ? void 0 : data.startDate, "  && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' "),
+        Encounter: "Appointment.id in Encounter.appointmentId && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Triaged'"
+      },
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return {name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age}),status:document(Encounter.status),practitioner_details:(for prac in Encounter.practitioner_details return merge(prac,{speciality:(for cod in CodeableConceptMaster filter cod._id==prac.speciality return document(cod.coding))}))},{appointmentId:(filter Appointment.id in Encounter.appointmentId return merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)},{photo:document(per.photo)})),resourcecode:merge(document(Appointment.resourcecode),{name:merge(document(document(Appointment.resourcecode).name))}),SpecialtyID:(for spe in CodeableConceptMaster filter Appointment.SpecialtyID any == spe.id return merge(spe,{coding:document(spe.coding)}))}))})"
+    };
   }
 };
 
@@ -39858,21 +40352,25 @@ 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 _$patient_id, _$patient_id$, _$practitioner_detail, _$practitioner_detail2, _$patient_id2, _$patient_id2$, _$type, _$type$;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": 'Louis Barrett',
-              "mrn": _ === 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$.alias,
-              "orderDate": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "orderTime": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": _ === 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.speciality,
-              "ward": 'Ward 1',
-              "dob": _ === 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$.birthDate,
-              "contact": 'Contact',
-              "type": _ === null || _ === void 0 ? void 0 : (_$type = _.type) === null || _$type === void 0 ? void 0 : (_$type$ = _$type[0]) === null || _$type$ === void 0 ? void 0 : _$type$.display,
-              "encounterStatus": 'Pending',
-              "view": true
+              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",
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId4 = _.appointmentId) === null || _$appointmentId4 === void 0 ? void 0 : (_$appointmentId4$ = _$appointmentId4[0]) === null || _$appointmentId4$ === void 0 ? void 0 : _$appointmentId4$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId6 = _.appointmentId) === null || _$appointmentId6 === void 0 ? void 0 : (_$appointmentId6$ = _$appointmentId6[0]) === null || _$appointmentId6$ === void 0 ? void 0 : _$appointmentId6$.start).format("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) {
+                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(", "),
+              ward: "Ward 1",
+              age: _ === null || _ === void 0 ? void 0 : (_$patient_id3 = _.patient_id) === null || _$patient_id3 === void 0 ? void 0 : (_$patient_id3$ = _$patient_id3[0]) === null || _$patient_id3$ === void 0 ? void 0 : _$patient_id3$.age,
+              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
             };
           }) : [];
           return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39917,21 +40415,25 @@ 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 _$patient_id3, _$patient_id3$, _$practitioner_detail3, _$practitioner_detail4, _$patient_id4, _$patient_id4$, _$type2, _$type2$;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": 'Louis Barrett',
-              "mrn": _ === 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$.alias,
-              "orderDate": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "orderTime": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": _ === 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.speciality,
-              "ward": 'Ward 1',
-              "dob": _ === 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$.birthDate,
-              "contact": 'Contact',
-              "type": _ === null || _ === void 0 ? void 0 : (_$type2 = _.type) === null || _$type2 === void 0 ? void 0 : (_$type2$ = _$type2[0]) === null || _$type2$ === void 0 ? void 0 : _$type2$.display,
-              "encounterStatus": 'Pending',
-              "view": true
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId11 = _.appointmentId) === null || _$appointmentId11 === void 0 ? void 0 : (_$appointmentId11$ = _$appointmentId11[0]) === null || _$appointmentId11$ === void 0 ? void 0 : _$appointmentId11$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId13 = _.appointmentId) === null || _$appointmentId13 === void 0 ? void 0 : (_$appointmentId13$ = _$appointmentId13[0]) === null || _$appointmentId13$ === void 0 ? void 0 : _$appointmentId13$.start).format("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) {
+                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),
+              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
             };
           }) : [];
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -39976,21 +40478,25 @@ 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 _$patient_id5, _$patient_id5$, _$practitioner_detail5, _$practitioner_detail6, _$patient_id6, _$patient_id6$, _$type3, _$type3$;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": 'Louis Barrett',
-              "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,
-              "orderDate": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "orderTime": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": _ === 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.speciality,
-              "ward": 'Ward 1',
-              "dob": _ === 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$.birthDate,
-              "contact": 'Contact',
-              "type": _ === null || _ === void 0 ? void 0 : (_$type3 = _.type) === null || _$type3 === void 0 ? void 0 : (_$type3$ = _$type3[0]) === null || _$type3$ === void 0 ? void 0 : _$type3$.display,
-              "encounterStatus": 'Pending',
-              "view": true
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId18 = _.appointmentId) === null || _$appointmentId18 === void 0 ? void 0 : (_$appointmentId18$ = _$appointmentId18[0]) === null || _$appointmentId18$ === void 0 ? void 0 : _$appointmentId18$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId20 = _.appointmentId) === null || _$appointmentId20 === void 0 ? void 0 : (_$appointmentId20$ = _$appointmentId20[0]) === null || _$appointmentId20$ === void 0 ? void 0 : _$appointmentId20$.start).format("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) {
+                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),
+              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
             };
           }) : [];
           return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40035,21 +40541,21 @@ 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_id7, _$patient_id7$, _$practitioner_detail7, _$practitioner_detail8, _$practitioner_detail9, _$patient_id$0$birthD, _$patient_id8, _$patient_id8$, _$type$0$display, _$type4, _$type4$;
+            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$;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": 'Louis Barrett',
-              "mrn": (_$patient_id$0$alias = _ === null || _ === void 0 ? void 0 : (_$patient_id7 = _.patient_id) === null || _$patient_id7 === void 0 ? void 0 : (_$patient_id7$ = _$patient_id7[0]) === null || _$patient_id7$ === void 0 ? void 0 : _$patient_id7$.alias) !== null && _$patient_id$0$alias !== void 0 ? _$patient_id$0$alias : '',
-              "orderDate": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "orderTime": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "speciality": (_$practitioner_detail7 = _ === 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) !== null && _$practitioner_detail7 !== void 0 ? _$practitioner_detail7 : '',
-              "ward": 'Ward 1',
-              "dob": (_$patient_id$0$birthD = _ === 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$.birthDate) !== null && _$patient_id$0$birthD !== void 0 ? _$patient_id$0$birthD : '',
-              "contact": 'Contact',
-              "type": (_$type$0$display = _ === null || _ === void 0 ? void 0 : (_$type4 = _.type) === null || _$type4 === void 0 ? void 0 : (_$type4$ = _$type4[0]) === null || _$type4$ === void 0 ? void 0 : _$type4$.display) !== null && _$type$0$display !== void 0 ? _$type$0$display : '',
-              "encounterStatus": 'Pending',
-              "view": true
+              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 : "",
+              orderDate: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
+              orderTime: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("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 : "",
+              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
             };
           }) : [];
           return _context4.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40089,30 +40595,34 @@ var GET_PATIENTS_CHECKED_IN_NURSE = createAsyncThunk("currentVisitStatsApiSlice/
           _context5.prev = 2;
           _context5.next = 5;
           return fetchData$3({
-            body: query$2.getPatientsCheckedInNurse(payload)
+            body: JSON.stringify(query$2.getPatientsCheckedInNurse(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 _$PersonID, _$PersonID$, _$PersonID$$name, _$PersonID$$name$, _$PersonID2, _$PersonID2$, _$type5, _$type5$, _$practitioner_detail10, _$practitioner_detail11;
+            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;
 
             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,
-              "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,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type5 = _.type) === null || _$type5 === void 0 ? void 0 : (_$type5$ = _$type5[0]) === null || _$type5$ === void 0 ? void 0 : _$type5$.display,
-              "speciality": _ === 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.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId26 = _.appointmentId) === null || _$appointmentId26 === void 0 ? void 0 : (_$appointmentId26$ = _$appointmentId26[0]) === null || _$appointmentId26$ === void 0 ? void 0 : _$appointmentId26$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId28 = _.appointmentId) === null || _$appointmentId28 === void 0 ? void 0 : (_$appointmentId28$ = _$appointmentId28[0]) === null || _$appointmentId28$ === void 0 ? void 0 : _$appointmentId28$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context5.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40151,30 +40661,34 @@ var GET_VISIT_COMPLETED_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getV
           _context6.prev = 2;
           _context6.next = 5;
           return fetchData$3({
-            body: query$2.getVisitCompletedNurse(payload)
+            body: JSON.stringify(query$2.getVisitCompletedNurse(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 _$PersonID3, _$PersonID3$, _$PersonID3$$name, _$PersonID3$$name$, _$PersonID4, _$PersonID4$, _$type6, _$type6$, _$practitioner_detail12, _$practitioner_detail13;
+            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;
 
             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,
-              "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,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type6 = _.type) === null || _$type6 === void 0 ? void 0 : (_$type6$ = _$type6[0]) === null || _$type6$ === void 0 ? void 0 : _$type6$.display,
-              "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',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId34 = _.appointmentId) === null || _$appointmentId34 === void 0 ? void 0 : (_$appointmentId34$ = _$appointmentId34[0]) === null || _$appointmentId34$ === void 0 ? void 0 : _$appointmentId34$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId36 = _.appointmentId) === null || _$appointmentId36 === void 0 ? void 0 : (_$appointmentId36$ = _$appointmentId36[0]) === null || _$appointmentId36$ === void 0 ? void 0 : _$appointmentId36$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40213,30 +40727,30 @@ var GET_PATIENTS_NO_SHOWS_NURSE = createAsyncThunk("currentVisitStatsApiSlice/ge
           _context7.prev = 2;
           _context7.next = 5;
           return fetchData$3({
-            body: query$2.getPatientsNoShowsNurse(payload)
+            body: JSON.stringify(query$2.getPatientsNoShowsNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID5, _$PersonID5$, _$PersonID5$$name, _$PersonID5$$name$, _$PersonID6, _$PersonID6$, _$type7, _$type7$, _$practitioner_detail14, _$practitioner_detail15;
+            var _$PersonID, _$PersonID$, _$PersonID$$name, _$PersonID$$name$, _$PersonID2, _$PersonID2$, _$type2, _$type2$, _$practitioner_detail8, _$practitioner_detail9;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID5 = _.PersonID) === null || _$PersonID5 === void 0 ? void 0 : (_$PersonID5$ = _$PersonID5[0]) === null || _$PersonID5$ === void 0 ? void 0 : (_$PersonID5$$name = _$PersonID5$.name) === null || _$PersonID5$$name === void 0 ? void 0 : (_$PersonID5$$name$ = _$PersonID5$$name[0]) === null || _$PersonID5$$name$ === void 0 ? void 0 : _$PersonID5$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID6 = _.PersonID) === null || _$PersonID6 === void 0 ? void 0 : (_$PersonID6$ = _$PersonID6[0]) === null || _$PersonID6$ === void 0 ? void 0 : _$PersonID6$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type7 = _.type) === null || _$type7 === void 0 ? void 0 : (_$type7$ = _$type7[0]) === null || _$type7$ === void 0 ? void 0 : _$type7$.display,
-              "speciality": _ === 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.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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,
+              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,
+              contact: "Contact",
+              refNo: "Ref No",
+              date: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("hh:mm A") : "",
+              visittype: _ === null || _ === void 0 ? void 0 : (_$type2 = _.type) === null || _$type2 === void 0 ? void 0 : (_$type2$ = _$type2[0]) === null || _$type2$ === void 0 ? void 0 : _$type2$.display,
+              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
+              Attend: true
             };
           }) : [];
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40275,30 +40789,34 @@ var GET_TRAIGE_DONE_NURSE = createAsyncThunk("currentVisitStatsApiSlice/getTriag
           _context8.prev = 2;
           _context8.next = 5;
           return fetchData$3({
-            body: query$2.getTriageDoneNurse(payload)
+            body: JSON.stringify(query$2.getTriageDoneNurse(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID7, _$PersonID7$, _$PersonID7$$name, _$PersonID7$$name$, _$PersonID8, _$PersonID8$, _$type8, _$type8$, _$practitioner_detail16, _$practitioner_detail17;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID7 = _.PersonID) === null || _$PersonID7 === void 0 ? void 0 : (_$PersonID7$ = _$PersonID7[0]) === null || _$PersonID7$ === void 0 ? void 0 : (_$PersonID7$$name = _$PersonID7$.name) === null || _$PersonID7$$name === void 0 ? void 0 : (_$PersonID7$$name$ = _$PersonID7$$name[0]) === null || _$PersonID7$$name$ === void 0 ? void 0 : _$PersonID7$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID8 = _.PersonID) === null || _$PersonID8 === void 0 ? void 0 : (_$PersonID8$ = _$PersonID8[0]) === null || _$PersonID8$ === void 0 ? void 0 : _$PersonID8$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type8 = _.type) === null || _$type8 === void 0 ? void 0 : (_$type8$ = _$type8[0]) === null || _$type8$ === void 0 ? void 0 : _$type8$.display,
-              "speciality": _ === 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.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId42 = _.appointmentId) === null || _$appointmentId42 === void 0 ? void 0 : (_$appointmentId42$ = _$appointmentId42[0]) === null || _$appointmentId42$ === void 0 ? void 0 : _$appointmentId42$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId44 = _.appointmentId) === null || _$appointmentId44 === void 0 ? void 0 : (_$appointmentId44$ = _$appointmentId44[0]) === null || _$appointmentId44$ === void 0 ? void 0 : _$appointmentId44$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context8.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40338,30 +40856,30 @@ var GET_PATIENTS_NO_SHOWS_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/g
           _context9.prev = 2;
           _context9.next = 5;
           return fetchData$3({
-            body: query$2.getPatientsNoShowsDoctor(payload)
+            body: JSON.stringify(query$2.getPatientsNoShowsDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID9, _$PersonID9$, _$PersonID9$$name, _$PersonID9$$name$, _$PersonID10, _$PersonID10$, _$type9, _$type9$, _$practitioner_detail18, _$practitioner_detail19;
+            var _$PersonID3, _$PersonID3$, _$PersonID3$$name, _$PersonID3$$name$, _$PersonID4, _$PersonID4$, _$type3, _$type3$, _$practitioner_detail12, _$practitioner_detail13;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID9 = _.PersonID) === null || _$PersonID9 === void 0 ? void 0 : (_$PersonID9$ = _$PersonID9[0]) === null || _$PersonID9$ === void 0 ? void 0 : (_$PersonID9$$name = _$PersonID9$.name) === null || _$PersonID9$$name === void 0 ? void 0 : (_$PersonID9$$name$ = _$PersonID9$$name[0]) === null || _$PersonID9$$name$ === void 0 ? void 0 : _$PersonID9$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID10 = _.PersonID) === null || _$PersonID10 === void 0 ? void 0 : (_$PersonID10$ = _$PersonID10[0]) === null || _$PersonID10$ === void 0 ? void 0 : _$PersonID10$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type9 = _.type) === null || _$type9 === void 0 ? void 0 : (_$type9$ = _$type9[0]) === null || _$type9$ === void 0 ? void 0 : _$type9$.display,
-              "speciality": _ === 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.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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,
+              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,
+              contact: "Contact",
+              refNo: "Ref No",
+              date: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("DD MMM,YYYY") : "",
+              time: (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format("hh:mm A") : "",
+              visittype: _ === null || _ === void 0 ? void 0 : (_$type3 = _.type) === null || _$type3 === void 0 ? void 0 : (_$type3$ = _$type3[0]) === null || _$type3$ === void 0 ? void 0 : _$type3$.display,
+              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
+              Attend: true
             };
           }) : [];
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40400,30 +40918,34 @@ var GET_PATIENTS_CHECKED_IN_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice
           _context10.prev = 2;
           _context10.next = 5;
           return fetchData$3({
-            body: query$2.getPatientsCheckedInDoctor(payload)
+            body: JSON.stringify(query$2.getPatientsCheckedInDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID11, _$PersonID11$, _$PersonID11$$name, _$PersonID11$$name$, _$PersonID12, _$PersonID12$, _$type10, _$type10$, _$practitioner_detail20, _$practitioner_detail21;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID11 = _.PersonID) === null || _$PersonID11 === void 0 ? void 0 : (_$PersonID11$ = _$PersonID11[0]) === null || _$PersonID11$ === void 0 ? void 0 : (_$PersonID11$$name = _$PersonID11$.name) === null || _$PersonID11$$name === void 0 ? void 0 : (_$PersonID11$$name$ = _$PersonID11$$name[0]) === null || _$PersonID11$$name$ === void 0 ? void 0 : _$PersonID11$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID12 = _.PersonID) === null || _$PersonID12 === void 0 ? void 0 : (_$PersonID12$ = _$PersonID12[0]) === null || _$PersonID12$ === void 0 ? void 0 : _$PersonID12$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type10 = _.type) === null || _$type10 === void 0 ? void 0 : (_$type10$ = _$type10[0]) === null || _$type10$ === void 0 ? void 0 : _$type10$.display,
-              "speciality": _ === null || _ === void 0 ? void 0 : (_$practitioner_detail20 = _.practitioner_details) === null || _$practitioner_detail20 === void 0 ? void 0 : (_$practitioner_detail21 = _$practitioner_detail20[0]) === null || _$practitioner_detail21 === void 0 ? void 0 : _$practitioner_detail21.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId50 = _.appointmentId) === null || _$appointmentId50 === void 0 ? void 0 : (_$appointmentId50$ = _$appointmentId50[0]) === null || _$appointmentId50$ === void 0 ? void 0 : _$appointmentId50$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId52 = _.appointmentId) === null || _$appointmentId52 === void 0 ? void 0 : (_$appointmentId52$ = _$appointmentId52[0]) === null || _$appointmentId52$ === void 0 ? void 0 : _$appointmentId52$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40462,30 +40984,34 @@ var GET_VISIT_COMPLETED_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/get
           _context11.prev = 2;
           _context11.next = 5;
           return fetchData$3({
-            body: query$2.getVisitCompletedDoctor(payload)
+            body: JSON.stringify(query$2.getVisitCompletedDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID13, _$PersonID13$, _$PersonID13$$name, _$PersonID13$$name$, _$PersonID14, _$PersonID14$, _$type11, _$type11$, _$practitioner_detail22, _$practitioner_detail23;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID13 = _.PersonID) === null || _$PersonID13 === void 0 ? void 0 : (_$PersonID13$ = _$PersonID13[0]) === null || _$PersonID13$ === void 0 ? void 0 : (_$PersonID13$$name = _$PersonID13$.name) === null || _$PersonID13$$name === void 0 ? void 0 : (_$PersonID13$$name$ = _$PersonID13$$name[0]) === null || _$PersonID13$$name$ === void 0 ? void 0 : _$PersonID13$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID14 = _.PersonID) === null || _$PersonID14 === void 0 ? void 0 : (_$PersonID14$ = _$PersonID14[0]) === null || _$PersonID14$ === void 0 ? void 0 : _$PersonID14$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type11 = _.type) === null || _$type11 === void 0 ? void 0 : (_$type11$ = _$type11[0]) === null || _$type11$ === void 0 ? void 0 : _$type11$.display,
-              "speciality": _ === null || _ === void 0 ? void 0 : (_$practitioner_detail22 = _.practitioner_details) === null || _$practitioner_detail22 === void 0 ? void 0 : (_$practitioner_detail23 = _$practitioner_detail22[0]) === null || _$practitioner_detail23 === void 0 ? void 0 : _$practitioner_detail23.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId58 = _.appointmentId) === null || _$appointmentId58 === void 0 ? void 0 : (_$appointmentId58$ = _$appointmentId58[0]) === null || _$appointmentId58$ === void 0 ? void 0 : _$appointmentId58$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId60 = _.appointmentId) === null || _$appointmentId60 === void 0 ? void 0 : (_$appointmentId60$ = _$appointmentId60[0]) === null || _$appointmentId60$ === void 0 ? void 0 : _$appointmentId60$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -40524,30 +41050,34 @@ var GET_TRAIGE_DONE_DOCTOR = createAsyncThunk("currentVisitStatsApiSlice/getTria
           _context12.prev = 2;
           _context12.next = 5;
           return fetchData$3({
-            body: query$2.getTriageDoneDoctor(payload)
+            body: JSON.stringify(query$2.getTriageDoneDoctor(payload))
           }, __readDocumentUrl__);
 
         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 _$PersonID15, _$PersonID15$, _$PersonID15$$name, _$PersonID15$$name$, _$PersonID16, _$PersonID16$, _$type12, _$type12$, _$practitioner_detail24, _$practitioner_detail25;
+            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;
 
             return {
-              "img": 'https://www.fillmurray.com/640/360',
-              "name": _ === null || _ === void 0 ? void 0 : (_$PersonID15 = _.PersonID) === null || _$PersonID15 === void 0 ? void 0 : (_$PersonID15$ = _$PersonID15[0]) === null || _$PersonID15$ === void 0 ? void 0 : (_$PersonID15$$name = _$PersonID15$.name) === null || _$PersonID15$$name === void 0 ? void 0 : (_$PersonID15$$name$ = _$PersonID15$$name[0]) === null || _$PersonID15$$name$ === void 0 ? void 0 : _$PersonID15$$name$.given,
-              "mrn": 'MRN',
-              "age": 'Age',
-              "gender": _ === null || _ === void 0 ? void 0 : (_$PersonID16 = _.PersonID) === null || _$PersonID16 === void 0 ? void 0 : (_$PersonID16$ = _$PersonID16[0]) === null || _$PersonID16$ === void 0 ? void 0 : _$PersonID16$.gender,
-              "contact": 'Contact',
-              "refNo": 'Ref No',
-              "date": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('DD MMM,YYYY') : '',
-              "time": (_ === null || _ === void 0 ? void 0 : _.start) ? moment.unix(_ === null || _ === void 0 ? void 0 : _.start).format('hh:mm A') : '',
-              "visittype": _ === null || _ === void 0 ? void 0 : (_$type12 = _.type) === null || _$type12 === void 0 ? void 0 : (_$type12$ = _$type12[0]) === null || _$type12$ === void 0 ? void 0 : _$type12$.display,
-              "speciality": _ === null || _ === void 0 ? void 0 : (_$practitioner_detail24 = _.practitioner_details) === null || _$practitioner_detail24 === void 0 ? void 0 : (_$practitioner_detail25 = _$practitioner_detail24[0]) === null || _$practitioner_detail25 === void 0 ? void 0 : _$practitioner_detail25.speciality,
-              "clinic": 'Clinic',
-              "encounterStatus": 'Pending',
+              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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId66 = _.appointmentId) === null || _$appointmentId66 === void 0 ? void 0 : (_$appointmentId66$ = _$appointmentId66[0]) === null || _$appointmentId66$ === void 0 ? void 0 : _$appointmentId66$.start).format("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) ? moment.unix(_ === null || _ === void 0 ? void 0 : (_$appointmentId68 = _.appointmentId) === null || _$appointmentId68 === void 0 ? void 0 : (_$appointmentId68$ = _$appointmentId68[0]) === null || _$appointmentId68$ === void 0 ? void 0 : _$appointmentId68$.start).format("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) {
+                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
+              Attend: true
             };
           }) : [];
           return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {