primarycare-binder 1.1.43 → 1.1.45

package/dist/index.cjs.js

@@ -8656,6 +8656,90 @@ var getAge = function getAge(date) {
   return "";
 };
 
+var getLocationInfo$1 = /*#__PURE__*/function () {
+  var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(myLocation, city) {
+    var obj,
+        lat,
+        _long4,
+        info,
+        _args4 = arguments;
+
+    return regeneratorRuntime.wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            obj = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : {};
+
+            if (obj[city]) {
+              _context4.next = 7;
+              break;
+            }
+
+            lat = myLocation.lat, _long4 = myLocation["long"];
+            _context4.next = 5;
+            return getLatLong(city);
+
+          case 5:
+            info = _context4.sent;
+
+            if (info.lat && info["long"]) {
+              obj[city] = getDisctanceFromLatLonInKm(info.lat, info["long"], lat, _long4);
+            }
+
+          case 7:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4);
+  }));
+
+  return function getLocationInfo(_x3, _x4) {
+    return _ref6.apply(this, arguments);
+  };
+}();
+
+var calculationExp = function calculationExp(jexp) {
+  var expInMs = 0;
+  jexp.forEach(function () {
+    var exp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var start_date = exp.start_date,
+        end_date = exp.end_date;
+
+    if (typeof start_date === "number") {
+      if (typeof end_date === "number") {
+        if (start_date < end_date) {
+          expInMs += (end_date - start_date) * 1000;
+        }
+      } else {
+        expInMs += (Date.now() - start_date) * 1000;
+      }
+    }
+  });
+  var expInDays = moment(expInMs).diff(moment(0), "days");
+  var expInMonths = moment(expInMs).diff(moment(0), "months");
+  var expInYears = moment(expInMs).diff(moment(0), "years");
+
+  if (expInYears >= 1) {
+    var value = Math.floor(expInYears);
+    return "".concat(value, " year") + (value > 1 ? "s" : "");
+  }
+
+  if (expInMonths >= 1) {
+    var _value = Math.floor(expInMonths);
+
+    return "".concat(_value, " month") + (_value > 1 ? "s" : "");
+  }
+
+  if (expInDays >= 1) {
+    var _value2 = Math.floor(expInDays);
+
+    return "".concat(_value2, " day") + (_value2 > 1 ? "s" : "");
+  }
+
+  return "0 days";
+};
+
 var _extraReducers$F;
 var __options$a = {
   method: "POST",
@@ -11006,6 +11090,13 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
       _ref8,
       rejectWithValue,
       _practData$,
+      _practData$2,
+      _practData$2$practiti,
+      _practData$2$practiti2,
+      _practData$2$practiti3,
+      _practData$2$practiti4,
+      _practData$2$practiti5,
+      _practData$2$practiti6,
       _resp$result,
       _payload$start,
       start,
@@ -11025,81 +11116,109 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
       practData,
       body,
       resp,
+      _yield$getCurrentPosi,
+      myLat,
+      myLong,
+      locationInfo,
+      city,
+      kms,
       data,
       slots,
       resourceInfo,
       healthCareId,
       info,
-      _practData$2,
       _practData$3,
-      _practData$3$Organiza,
-      _practData$3$Organiza2,
       _practData$4,
       _practData$4$Organiza,
       _practData$4$Organiza2,
-      _practData$4$Organiza3,
       _practData$5,
       _practData$5$Organiza,
       _practData$5$Organiza2,
       _practData$5$Organiza3,
       _practData$6,
       _practData$6$Organiza,
+      _practData$6$Organiza2,
+      _practData$6$Organiza3,
       _practData$7,
       _practData$7$Organiza,
       _practData$8,
+      _practData$8$Organiza,
       _practData$9,
       _practData$10,
       _practData$11,
       _practData$12,
-      _practData$12$photo,
-      _practData$12$photo$,
       _practData$13,
-      _practData$13$practit,
-      _practData$13$practit2,
-      _practData$13$practit3,
+      _practData$13$photo,
+      _practData$13$photo$,
       _practData$14,
-      _practData$14$communi,
+      _practData$14$practit,
+      _practData$14$practit2,
+      _practData$14$practit3,
       _practData$15,
+      _practData$15$communi,
       _practData$16,
-      _practData$16$gender,
-      _practData$16$gender$,
-      _practData$16$gender$2,
-      _ref9,
-      _ref9$forEach,
       _practData$17,
+      _practData$17$gender,
+      _practData$17$gender$,
+      _practData$17$gender$2,
+      _practData$17$gender$3,
+      _ref9,
       _practData$18,
-      _practData$18$qualifi,
-      _practData$18$qualifi2,
+      _practData$18$practit,
+      _practData$18$practit2,
       _practData$19,
       _practData$19$practit,
       _practData$19$practit2,
       _practData$19$practit3,
+      _practData$19$practit4,
+      _practData$19$practit5,
+      _practData$19$practit6,
       _practData$20,
-      _practData$20$address,
-      _practData$20$address2,
+      _practData$20$contact,
+      _practData$20$contact2,
+      _practData$20$contact3,
+      _practData$20$contact4,
       _practData$21,
-      _practData$21$name,
+      _practData$21$qualifi,
+      _practData$21$qualifi2,
       _practData$22,
-      _practData$22$address,
-      _practData$22$address2,
+      _practData$22$practit,
+      _practData$22$practit2,
+      _practData$22$practit3,
       _practData$23,
-      _practData$23$practit,
-      _practData$23$practit2,
-      _practData$23$practit3,
-      _practData$23$practit4,
-      _practData$0$practiti,
+      _practData$23$address,
+      _practData$23$address2,
       _practData$24,
-      _practData$24$practit,
-      _practData$24$practit2,
-      _practData$24$practit3,
+      _practData$24$name,
       _practData$25,
       _practData$25$practit,
       _practData$25$practit2,
+      _practData$25$practit3,
+      _practData$25$practit4,
+      _practData$0$practiti,
       _practData$26,
+      _practData$26$practit,
+      _practData$26$practit2,
+      _practData$26$practit3,
       _practData$27,
+      _practData$27$practit,
+      _practData$27$practit2,
       _practData$28,
-      _practData$28$photo,
-      _practData$28$photo$,
+      _practData$29,
+      _practData$30,
+      _practData$30$photo,
+      _practData$30$photo$,
+      _practData$31,
+      _practData$31$biograp,
+      _practData$31$biograp2,
+      _practData$32,
+      _practData$33,
+      _practData$33$practit,
+      _practData$33$practit2,
+      _practData$33$practit3,
+      _practData$33$practit4,
+      _practData$33$practit5,
+      _practData$33$practit6,
       languages,
       gender,
       designation,
@@ -11161,6 +11280,32 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
 
         case 20:
           resp = _context4.sent;
+          _context4.next = 23;
+          return getCurrentPosition();
+
+        case 23:
+          _yield$getCurrentPosi = _context4.sent;
+          myLat = _yield$getCurrentPosi.lat;
+          myLong = _yield$getCurrentPosi["long"];
+          locationInfo = {};
+          city = ((_practData$2 = practData[0]) === null || _practData$2 === void 0 ? void 0 : (_practData$2$practiti = _practData$2.practitioner_role) === null || _practData$2$practiti === void 0 ? void 0 : (_practData$2$practiti2 = _practData$2$practiti[0]) === null || _practData$2$practiti2 === void 0 ? void 0 : (_practData$2$practiti3 = _practData$2$practiti2.OrgID) === null || _practData$2$practiti3 === void 0 ? void 0 : (_practData$2$practiti4 = _practData$2$practiti3.address) === null || _practData$2$practiti4 === void 0 ? void 0 : (_practData$2$practiti5 = _practData$2$practiti4[0]) === null || _practData$2$practiti5 === void 0 ? void 0 : (_practData$2$practiti6 = _practData$2$practiti5.city) === null || _practData$2$practiti6 === void 0 ? void 0 : _practData$2$practiti6.geogLevelName) || "";
+          kms = "0 kms";
+
+          if (!(myLat && myLong && city)) {
+            _context4.next = 33;
+            break;
+          }
+
+          _context4.next = 32;
+          return getLocationInfo$1({
+            lat: myLat,
+            "long": myLong
+          }, city, locationInfo);
+
+        case 32:
+          kms = locationInfo[city] || "0 kms";
+
+        case 33:
           data = (resp === null || resp === void 0 ? void 0 : (_resp$result = resp.result) === null || _resp$result === void 0 ? void 0 : _resp$result[0]) || {};
           slots = (data === null || data === void 0 ? void 0 : data.slots) || [];
           resourceInfo = {
@@ -11206,22 +11351,22 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
           if (Array.isArray(practData)) {
             if (isClinic) {
               info["locationId"] = id[0];
-              info["name"] = ((_practData$2 = practData[0]) === null || _practData$2 === void 0 ? void 0 : _practData$2.shortdesc) || "";
-              info["hospitalName"] = ((_practData$3 = practData[0]) === null || _practData$3 === void 0 ? void 0 : (_practData$3$Organiza = _practData$3.Organization) === null || _practData$3$Organiza === void 0 ? void 0 : (_practData$3$Organiza2 = _practData$3$Organiza[0]) === null || _practData$3$Organiza2 === void 0 ? void 0 : _practData$3$Organiza2.name) || "";
-              info["hospitalLocation"] = ((_practData$4 = practData[0]) === null || _practData$4 === void 0 ? void 0 : (_practData$4$Organiza = _practData$4.Organization) === null || _practData$4$Organiza === void 0 ? void 0 : (_practData$4$Organiza2 = _practData$4$Organiza.address) === null || _practData$4$Organiza2 === void 0 ? void 0 : (_practData$4$Organiza3 = _practData$4$Organiza2[0]) === null || _practData$4$Organiza3 === void 0 ? void 0 : _practData$4$Organiza3.line) || "";
-              info["title"] = ((_practData$5 = practData[0]) === null || _practData$5 === void 0 ? void 0 : (_practData$5$Organiza = _practData$5.Organization) === null || _practData$5$Organiza === void 0 ? void 0 : (_practData$5$Organiza2 = _practData$5$Organiza.address) === null || _practData$5$Organiza2 === void 0 ? void 0 : (_practData$5$Organiza3 = _practData$5$Organiza2[0]) === null || _practData$5$Organiza3 === void 0 ? void 0 : _practData$5$Organiza3.line) || "";
-              info["kms"] = "0kms";
-              info["orgId"] = (_practData$6 = practData[0]) === null || _practData$6 === void 0 ? void 0 : (_practData$6$Organiza = _practData$6.Organization) === null || _practData$6$Organiza === void 0 ? void 0 : _practData$6$Organiza.id;
-              info["org_Id"] = (_practData$7 = practData[0]) === null || _practData$7 === void 0 ? void 0 : (_practData$7$Organiza = _practData$7.Organization) === null || _practData$7$Organiza === void 0 ? void 0 : _practData$7$Organiza._id;
-              info["clinicId"] = (_practData$8 = practData[0]) === null || _practData$8 === void 0 ? void 0 : _practData$8.id;
-              info["id"] = (_practData$9 = practData[0]) === null || _practData$9 === void 0 ? void 0 : _practData$9.id;
-              info["_id"] = (_practData$10 = practData[0]) === null || _practData$10 === void 0 ? void 0 : _practData$10._id;
-              info["_key"] = (_practData$11 = practData[0]) === null || _practData$11 === void 0 ? void 0 : _practData$11._key;
-              info["img"] = getImgUrl((_practData$12 = practData[0]) === null || _practData$12 === void 0 ? void 0 : (_practData$12$photo = _practData$12.photo) === null || _practData$12$photo === void 0 ? void 0 : (_practData$12$photo$ = _practData$12$photo[0]) === null || _practData$12$photo$ === void 0 ? void 0 : _practData$12$photo$.fileid);
+              info["name"] = ((_practData$3 = practData[0]) === null || _practData$3 === void 0 ? void 0 : _practData$3.shortdesc) || "";
+              info["hospitalName"] = ((_practData$4 = practData[0]) === null || _practData$4 === void 0 ? void 0 : (_practData$4$Organiza = _practData$4.Organization) === null || _practData$4$Organiza === void 0 ? void 0 : (_practData$4$Organiza2 = _practData$4$Organiza[0]) === null || _practData$4$Organiza2 === void 0 ? void 0 : _practData$4$Organiza2.name) || "";
+              info["hospitalLocation"] = ((_practData$5 = practData[0]) === null || _practData$5 === void 0 ? void 0 : (_practData$5$Organiza = _practData$5.Organization) === null || _practData$5$Organiza === void 0 ? void 0 : (_practData$5$Organiza2 = _practData$5$Organiza.address) === null || _practData$5$Organiza2 === void 0 ? void 0 : (_practData$5$Organiza3 = _practData$5$Organiza2[0]) === null || _practData$5$Organiza3 === void 0 ? void 0 : _practData$5$Organiza3.line) || "";
+              info["title"] = ((_practData$6 = practData[0]) === null || _practData$6 === void 0 ? void 0 : (_practData$6$Organiza = _practData$6.Organization) === null || _practData$6$Organiza === void 0 ? void 0 : (_practData$6$Organiza2 = _practData$6$Organiza.address) === null || _practData$6$Organiza2 === void 0 ? void 0 : (_practData$6$Organiza3 = _practData$6$Organiza2[0]) === null || _practData$6$Organiza3 === void 0 ? void 0 : _practData$6$Organiza3.line) || "";
+              info["kms"] = kms;
+              info["orgId"] = (_practData$7 = practData[0]) === null || _practData$7 === void 0 ? void 0 : (_practData$7$Organiza = _practData$7.Organization) === null || _practData$7$Organiza === void 0 ? void 0 : _practData$7$Organiza.id;
+              info["org_Id"] = (_practData$8 = practData[0]) === null || _practData$8 === void 0 ? void 0 : (_practData$8$Organiza = _practData$8.Organization) === null || _practData$8$Organiza === void 0 ? void 0 : _practData$8$Organiza._id;
+              info["clinicId"] = (_practData$9 = practData[0]) === null || _practData$9 === void 0 ? void 0 : _practData$9.id;
+              info["id"] = (_practData$10 = practData[0]) === null || _practData$10 === void 0 ? void 0 : _practData$10.id;
+              info["_id"] = (_practData$11 = practData[0]) === null || _practData$11 === void 0 ? void 0 : _practData$11._id;
+              info["_key"] = (_practData$12 = practData[0]) === null || _practData$12 === void 0 ? void 0 : _practData$12._key;
+              info["img"] = getImgUrl((_practData$13 = practData[0]) === null || _practData$13 === void 0 ? void 0 : (_practData$13$photo = _practData$13.photo) === null || _practData$13$photo === void 0 ? void 0 : (_practData$13$photo$ = _practData$13$photo[0]) === null || _practData$13$photo$ === void 0 ? void 0 : _practData$13$photo$.fileid);
             } else {
-              info["orgId"] = (_practData$13 = practData[0]) === null || _practData$13 === void 0 ? void 0 : (_practData$13$practit = _practData$13.practitioner_role) === null || _practData$13$practit === void 0 ? void 0 : (_practData$13$practit2 = _practData$13$practit[0]) === null || _practData$13$practit2 === void 0 ? void 0 : (_practData$13$practit3 = _practData$13$practit2.OrgID) === null || _practData$13$practit3 === void 0 ? void 0 : _practData$13$practit3.id;
+              info["orgId"] = (_practData$14 = practData[0]) === null || _practData$14 === void 0 ? void 0 : (_practData$14$practit = _practData$14.practitioner_role) === null || _practData$14$practit === void 0 ? void 0 : (_practData$14$practit2 = _practData$14$practit[0]) === null || _practData$14$practit2 === void 0 ? void 0 : (_practData$14$practit3 = _practData$14$practit2.OrgID) === null || _practData$14$practit3 === void 0 ? void 0 : _practData$14$practit3.id;
               languages = new Set();
-              (_practData$14 = practData[0]) === null || _practData$14 === void 0 ? void 0 : (_practData$14$communi = _practData$14.communication) === null || _practData$14$communi === void 0 ? void 0 : _practData$14$communi.forEach(function (c) {
+              (_practData$15 = practData[0]) === null || _practData$15 === void 0 ? void 0 : (_practData$15$communi = _practData$15.communication) === null || _practData$15$communi === void 0 ? void 0 : _practData$15$communi.forEach(function (c) {
                 var _c$Type;
 
                 if ((c === null || c === void 0 ? void 0 : (_c$Type = c.Type) === null || _c$Type === void 0 ? void 0 : _c$Type.toLowerCase()) === "language") {
@@ -11234,39 +11379,47 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
                   }
                 }
               });
-              info["id"] = (_practData$15 = practData[0]) === null || _practData$15 === void 0 ? void 0 : _practData$15["id"];
-              gender = ((_practData$16 = practData[0]) === null || _practData$16 === void 0 ? void 0 : (_practData$16$gender = _practData$16.gender) === null || _practData$16$gender === void 0 ? void 0 : (_practData$16$gender$ = _practData$16$gender.coding) === null || _practData$16$gender$ === void 0 ? void 0 : (_practData$16$gender$2 = _practData$16$gender$[0]) === null || _practData$16$gender$2 === void 0 ? void 0 : _practData$16$gender$2.display) || "";
+              info["id"] = (_practData$16 = practData[0]) === null || _practData$16 === void 0 ? void 0 : _practData$16["id"];
+              gender = ((_practData$17 = practData[0]) === null || _practData$17 === void 0 ? void 0 : (_practData$17$gender = _practData$17.gender) === null || _practData$17$gender === void 0 ? void 0 : (_practData$17$gender$ = _practData$17$gender[0]) === null || _practData$17$gender$ === void 0 ? void 0 : (_practData$17$gender$2 = _practData$17$gender$.coding) === null || _practData$17$gender$2 === void 0 ? void 0 : (_practData$17$gender$3 = _practData$17$gender$2[0]) === null || _practData$17$gender$3 === void 0 ? void 0 : _practData$17$gender$3.display) || "";
               designation = "";
-              (_ref9 = [((_practData$17 = practData[0]) === null || _practData$17 === void 0 ? void 0 : _practData$17.position) || []]) === null || _ref9 === void 0 ? void 0 : (_ref9$forEach = _ref9.forEach) === null || _ref9$forEach === void 0 ? void 0 : _ref9$forEach.call(_ref9, function (s) {
-                var val = s === null || s === void 0 ? void 0 : s.coding;
+              (_ref9 = [(practData === null || practData === void 0 ? void 0 : (_practData$18 = practData[0]) === null || _practData$18 === void 0 ? void 0 : (_practData$18$practit = _practData$18.practitioner_role) === null || _practData$18$practit === void 0 ? void 0 : (_practData$18$practit2 = _practData$18$practit[0]) === null || _practData$18$practit2 === void 0 ? void 0 : _practData$18$practit2.SpecialtyID) || {}]) === null || _ref9 === void 0 ? void 0 : _ref9.forEach(function (s) {
+                var _s$coding;
 
-                if (val === null || val === void 0 ? void 0 : val.display) {
-                  if (designation) {
-                    designation += ", ";
-                  }
+                s === null || s === void 0 ? void 0 : (_s$coding = s.coding) === null || _s$coding === void 0 ? void 0 : _s$coding.forEach(function (val) {
+                  if (val === null || val === void 0 ? void 0 : val.display) {
+                    if (designation) {
+                      designation += ', ';
+                    }
 
-                  designation += val === null || val === void 0 ? void 0 : val.display;
-                  info.specialities.push({
-                    label: val === null || val === void 0 ? void 0 : val.display,
-                    id: s === null || s === void 0 ? void 0 : s.id
-                  });
-                }
+                    designation += val === null || val === void 0 ? void 0 : val.display;
+                    info.specialities.push({
+                      label: val === null || val === void 0 ? void 0 : val.display,
+                      id: s === null || s === void 0 ? void 0 : s.id
+                    });
+                  }
+                });
               });
+              info["role"] = (_practData$19 = practData[0]) === null || _practData$19 === void 0 ? void 0 : (_practData$19$practit = _practData$19.practitioner_role) === null || _practData$19$practit === void 0 ? void 0 : (_practData$19$practit2 = _practData$19$practit[0]) === null || _practData$19$practit2 === void 0 ? void 0 : (_practData$19$practit3 = _practData$19$practit2.role) === null || _practData$19$practit3 === void 0 ? void 0 : (_practData$19$practit4 = _practData$19$practit3[0]) === null || _practData$19$practit4 === void 0 ? void 0 : (_practData$19$practit5 = _practData$19$practit4.coding) === null || _practData$19$practit5 === void 0 ? void 0 : (_practData$19$practit6 = _practData$19$practit5[0]) === null || _practData$19$practit6 === void 0 ? void 0 : _practData$19$practit6.display;
+              info["mobile"] = (_practData$20 = practData[0]) === null || _practData$20 === void 0 ? void 0 : (_practData$20$contact = _practData$20.contact) === null || _practData$20$contact === void 0 ? void 0 : (_practData$20$contact2 = _practData$20$contact[0]) === null || _practData$20$contact2 === void 0 ? void 0 : (_practData$20$contact3 = _practData$20$contact2.telecom) === null || _practData$20$contact3 === void 0 ? void 0 : (_practData$20$contact4 = _practData$20$contact3[0]) === null || _practData$20$contact4 === void 0 ? void 0 : _practData$20$contact4.value;
               info["title"] = "".concat(gender).concat(gender && " | ").concat(designation);
-              info["subtext"] = ((_practData$18 = practData[0]) === null || _practData$18 === void 0 ? void 0 : (_practData$18$qualifi = _practData$18.qualification) === null || _practData$18$qualifi === void 0 ? void 0 : (_practData$18$qualifi2 = _practData$18$qualifi.map(function (q) {
+              info["gender"] = gender;
+              info["subtext"] = ((_practData$21 = practData[0]) === null || _practData$21 === void 0 ? void 0 : (_practData$21$qualifi = _practData$21.qualification) === null || _practData$21$qualifi === void 0 ? void 0 : (_practData$21$qualifi2 = _practData$21$qualifi.map(function (q) {
                 return (q === null || q === void 0 ? void 0 : q.name) || "";
-              })) === null || _practData$18$qualifi2 === void 0 ? void 0 : _practData$18$qualifi2.join(", ")) || "MBBS";
+              })) === null || _practData$21$qualifi2 === void 0 ? void 0 : _practData$21$qualifi2.join(", ")) || "MBBS";
               info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
-              info["hospitalName"] = ((_practData$19 = practData[0]) === null || _practData$19 === void 0 ? void 0 : (_practData$19$practit = _practData$19.practitioner_role) === null || _practData$19$practit === void 0 ? void 0 : (_practData$19$practit2 = _practData$19$practit[0]) === null || _practData$19$practit2 === void 0 ? void 0 : (_practData$19$practit3 = _practData$19$practit2.OrgID) === null || _practData$19$practit3 === void 0 ? void 0 : _practData$19$practit3.name) || "";
-              info["hospitalLocation"] = ((_practData$20 = practData[0]) === null || _practData$20 === void 0 ? void 0 : (_practData$20$address = _practData$20.address) === null || _practData$20$address === void 0 ? void 0 : (_practData$20$address2 = _practData$20$address[0]) === null || _practData$20$address2 === void 0 ? void 0 : _practData$20$address2.line) || "";
-              nameObj = ((_practData$21 = practData[0]) === null || _practData$21 === void 0 ? void 0 : (_practData$21$name = _practData$21.name) === null || _practData$21$name === void 0 ? void 0 : _practData$21$name[0]) || {};
+              info["hospitalName"] = ((_practData$22 = practData[0]) === null || _practData$22 === void 0 ? void 0 : (_practData$22$practit = _practData$22.practitioner_role) === null || _practData$22$practit === void 0 ? void 0 : (_practData$22$practit2 = _practData$22$practit[0]) === null || _practData$22$practit2 === void 0 ? void 0 : (_practData$22$practit3 = _practData$22$practit2.OrgID) === null || _practData$22$practit3 === void 0 ? void 0 : _practData$22$practit3.name) || "";
+              info["hospitalLocation"] = ((_practData$23 = practData[0]) === null || _practData$23 === void 0 ? void 0 : (_practData$23$address = _practData$23.address) === null || _practData$23$address === void 0 ? void 0 : (_practData$23$address2 = _practData$23$address[0]) === null || _practData$23$address2 === void 0 ? void 0 : _practData$23$address2.line) || "";
+              nameObj = ((_practData$24 = practData[0]) === null || _practData$24 === void 0 ? void 0 : (_practData$24$name = _practData$24.name) === null || _practData$24$name === void 0 ? void 0 : _practData$24$name[0]) || {};
               info["name"] = makeName(nameObj);
-              info["kms"] = ((_practData$22 = practData[0]) === null || _practData$22 === void 0 ? void 0 : (_practData$22$address = _practData$22.address) === null || _practData$22$address === void 0 ? void 0 : (_practData$22$address2 = _practData$22$address[0]) === null || _practData$22$address2 === void 0 ? void 0 : _practData$22$address2.distance) ? "".concat(practData[0].address[0].distance) : "0kms";
-              info["orgType"] = (_practData$23 = practData[0]) === null || _practData$23 === void 0 ? void 0 : (_practData$23$practit = _practData$23.practitioner_role) === null || _practData$23$practit === void 0 ? void 0 : (_practData$23$practit2 = _practData$23$practit[0]) === null || _practData$23$practit2 === void 0 ? void 0 : (_practData$23$practit3 = _practData$23$practit2.OrgID) === null || _practData$23$practit3 === void 0 ? void 0 : (_practData$23$practit4 = _practData$23$practit3.OrgType) === null || _practData$23$practit4 === void 0 ? void 0 : _practData$23$practit4[0];
-              info["org_Id"] = (_practData$0$practiti = (_practData$24 = practData[0]) === null || _practData$24 === void 0 ? void 0 : (_practData$24$practit = _practData$24.practitioner_role) === null || _practData$24$practit === void 0 ? void 0 : (_practData$24$practit2 = _practData$24$practit[0]) === null || _practData$24$practit2 === void 0 ? void 0 : (_practData$24$practit3 = _practData$24$practit2.OrgID) === null || _practData$24$practit3 === void 0 ? void 0 : _practData$24$practit3._id) !== null && _practData$0$practiti !== void 0 ? _practData$0$practiti : (_practData$25 = practData[0]) === null || _practData$25 === void 0 ? void 0 : (_practData$25$practit = _practData$25.practitioner_role) === null || _practData$25$practit === void 0 ? void 0 : (_practData$25$practit2 = _practData$25$practit[0]) === null || _practData$25$practit2 === void 0 ? void 0 : _practData$25$practit2.EntityName;
-              info["_id"] = (_practData$26 = practData[0]) === null || _practData$26 === void 0 ? void 0 : _practData$26._id;
-              info["_key"] = (_practData$27 = practData[0]) === null || _practData$27 === void 0 ? void 0 : _practData$27._key;
-              info["img"] = getImgUrl((_practData$28 = practData[0]) === null || _practData$28 === void 0 ? void 0 : (_practData$28$photo = _practData$28.photo) === null || _practData$28$photo === void 0 ? void 0 : (_practData$28$photo$ = _practData$28$photo[0]) === null || _practData$28$photo$ === void 0 ? void 0 : _practData$28$photo$.fileid);
+              info["kms"] = kms;
+              info["orgType"] = (_practData$25 = practData[0]) === null || _practData$25 === void 0 ? void 0 : (_practData$25$practit = _practData$25.practitioner_role) === null || _practData$25$practit === void 0 ? void 0 : (_practData$25$practit2 = _practData$25$practit[0]) === null || _practData$25$practit2 === void 0 ? void 0 : (_practData$25$practit3 = _practData$25$practit2.OrgID) === null || _practData$25$practit3 === void 0 ? void 0 : (_practData$25$practit4 = _practData$25$practit3.OrgType) === null || _practData$25$practit4 === void 0 ? void 0 : _practData$25$practit4[0];
+              info["org_Id"] = (_practData$0$practiti = (_practData$26 = practData[0]) === null || _practData$26 === void 0 ? void 0 : (_practData$26$practit = _practData$26.practitioner_role) === null || _practData$26$practit === void 0 ? void 0 : (_practData$26$practit2 = _practData$26$practit[0]) === null || _practData$26$practit2 === void 0 ? void 0 : (_practData$26$practit3 = _practData$26$practit2.OrgID) === null || _practData$26$practit3 === void 0 ? void 0 : _practData$26$practit3._id) !== null && _practData$0$practiti !== void 0 ? _practData$0$practiti : (_practData$27 = practData[0]) === null || _practData$27 === void 0 ? void 0 : (_practData$27$practit = _practData$27.practitioner_role) === null || _practData$27$practit === void 0 ? void 0 : (_practData$27$practit2 = _practData$27$practit[0]) === null || _practData$27$practit2 === void 0 ? void 0 : _practData$27$practit2.EntityName;
+              info["_id"] = (_practData$28 = practData[0]) === null || _practData$28 === void 0 ? void 0 : _practData$28._id;
+              info["_key"] = (_practData$29 = practData[0]) === null || _practData$29 === void 0 ? void 0 : _practData$29._key;
+              info["img"] = getImgUrl((_practData$30 = practData[0]) === null || _practData$30 === void 0 ? void 0 : (_practData$30$photo = _practData$30.photo) === null || _practData$30$photo === void 0 ? void 0 : (_practData$30$photo$ = _practData$30$photo[0]) === null || _practData$30$photo$ === void 0 ? void 0 : _practData$30$photo$.fileid);
+              info["bio"] = ((_practData$31 = practData[0]) === null || _practData$31 === void 0 ? void 0 : (_practData$31$biograp = _practData$31.biography) === null || _practData$31$biograp === void 0 ? void 0 : (_practData$31$biograp2 = _practData$31$biograp[0]) === null || _practData$31$biograp2 === void 0 ? void 0 : _practData$31$biograp2.biography_description) || '';
+              info["experience"] = calculationExp((_practData$32 = practData[0]) === null || _practData$32 === void 0 ? void 0 : _practData$32.job_experience);
+              info["hospitalLocation"] = ((_practData$33 = practData[0]) === null || _practData$33 === void 0 ? void 0 : (_practData$33$practit = _practData$33.practitioner_role) === null || _practData$33$practit === void 0 ? void 0 : (_practData$33$practit2 = _practData$33$practit[0]) === null || _practData$33$practit2 === void 0 ? void 0 : (_practData$33$practit3 = _practData$33$practit2.OrgID) === null || _practData$33$practit3 === void 0 ? void 0 : (_practData$33$practit4 = _practData$33$practit3.address) === null || _practData$33$practit4 === void 0 ? void 0 : (_practData$33$practit5 = _practData$33$practit4[0]) === null || _practData$33$practit5 === void 0 ? void 0 : (_practData$33$practit6 = _practData$33$practit5.city) === null || _practData$33$practit6 === void 0 ? void 0 : _practData$33$practit6.geogLevelName) || "";
             }
           }
 
@@ -11274,19 +11427,19 @@ var APPOINTMENT_UPDATE_READ = createAsyncThunk("appointmentReducer/upsertReadApp
             data: [info]
           }));
 
-        case 30:
-          _context4.prev = 30;
+        case 42:
+          _context4.prev = 42;
           _context4.t0 = _context4["catch"](2);
           return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context4.t0.message
           })));
 
-        case 33:
+        case 45:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[2, 30]]);
+  }, _callee4, null, [[2, 42]]);
 }))); // end
 // APPOINTMENT_READ
 
@@ -13813,94 +13966,9 @@ var practitionerReducer$1 = practitionerReducer.reducer;
 
 var _extraReducers$y;
 
-var getLocationInfo$1 = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(myLocation, city) {
-    var obj,
-        lat,
-        _long,
-        info,
-        _args = arguments;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            obj = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
-
-            if (obj[city]) {
-              _context.next = 7;
-              break;
-            }
-
-            lat = myLocation.lat, _long = myLocation["long"];
-            _context.next = 5;
-            return getLatLong(city);
-
-          case 5:
-            info = _context.sent;
-
-            if (info.lat && info["long"]) {
-              obj[city] = getDisctanceFromLatLonInKm(info.lat, info["long"], lat, _long);
-            }
-
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function getLocationInfo(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
-var calculationExp = function calculationExp(jexp) {
-  var expInMs = 0;
-  jexp.forEach(function () {
-    var exp = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    var start_date = exp.start_date,
-        end_date = exp.end_date;
-
-    if (typeof start_date === "number") {
-      if (typeof end_date === "number") {
-        if (start_date < end_date) {
-          expInMs += (end_date - start_date) * 1000;
-        }
-      } else {
-        expInMs += (Date.now() - start_date) * 1000;
-      }
-    }
-  });
-  var expInDays = moment(expInMs).diff(moment(0), "days");
-  var expInMonths = moment(expInMs).diff(moment(0), "months");
-  var expInYears = moment(expInMs).diff(moment(0), "years");
-
-  if (expInYears >= 1) {
-    var value = Math.floor(expInYears);
-    return "".concat(value, " year") + (value > 1 ? "s" : "");
-  }
-
-  if (expInMonths >= 1) {
-    var _value = Math.floor(expInMonths);
-
-    return "".concat(_value, " month") + (_value > 1 ? "s" : "");
-  }
-
-  if (expInDays >= 1) {
-    var _value2 = Math.floor(expInDays);
-
-    return "".concat(_value2, " day") + (_value2 > 1 ? "s" : "");
-  }
-
-  return "0 days";
-}; // DOCTER_LISTING
-
-
-var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
-      _ref3,
+      _ref2,
       rejectWithValue,
       Sdate,
       Edate,
@@ -13928,15 +13996,15 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
       myLong,
       locationInfo,
       promArr,
-      _args2 = arguments;
+      _args = arguments;
 
-  return regeneratorRuntime.wrap(function _callee2$(_context2) {
+  return regeneratorRuntime.wrap(function _callee$(_context) {
     while (1) {
-      switch (_context2.prev = _context2.next) {
+      switch (_context.prev = _context.next) {
         case 0:
-          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
-          _ref3 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref3.rejectWithValue;
-          _context2.prev = 2;
+          payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+          _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
+          _context.prev = 2;
           Sdate = new Date();
           Edate = new Date();
 
@@ -13973,8 +14041,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
               "filter": {
                 "org_id": hospital,
                 "practionerId": doctorId,
-                "startdate": getUtcTime(startTime),
-                "enddate": getUtcTime(endTime)
+                "startdate": getUtcTime(startDate),
+                "enddate": getUtcTime(endDate)
               }
             };
           } // body = {
@@ -13991,13 +14059,13 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           // }
 
 
-          _context2.next = 15;
+          _context.next = 15;
           return fetchData$3({
             body: JSON.stringify(body)
           });
 
         case 15:
-          data = _context2.sent;
+          data = _context.sent;
           returnData = [];
           allLangs = new Set();
           allCities = new Set();
@@ -14146,7 +14214,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$locationID4 = restData.locationID) === null || _restData$locationID4 === void 0 ? void 0 : (_restData$locationID5 = _restData$locationID4.photo) === null || _restData$locationID5 === void 0 ? void 0 : (_restData$locationID6 = _restData$locationID5[0]) === null || _restData$locationID6 === void 0 ? void 0 : _restData$locationID6.fileid);
                   } else {
-                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$practitione, _restData$practitione2, _restData$practitione3, _restData$practitione4, _restData$practitione5, _restData$hospital6, _restData$hospital6$t, _restData$hospital6$t2, _restData$hospital7, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital8, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$, _restData$biography, _restData$biography$;
+                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$practitione, _restData$practitione2, _restData$practitione3, _restData$practitione4, _restData$practitione5, _restData$hospital6, _restData$hospital6$c, _restData$hospital6$c2, _restData$hospital6$c3, _restData$hospital6$c4, _restData$hospital7, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital8, _restData$hospital9, _restData$hospital9$a, _restData$hospital9$a2, _restData$name, _restData$photo, _restData$photo$, _restData$address5, _restData$address5$, _restData$biography, _restData$biography$;
 
                     var _gender = (restData === null || restData === void 0 ? void 0 : (_restData$gender = restData.gender) === null || _restData$gender === void 0 ? void 0 : (_restData$gender$codi = _restData$gender.coding) === null || _restData$gender$codi === void 0 ? void 0 : (_restData$gender$codi2 = _restData$gender$codi[0]) === null || _restData$gender$codi2 === void 0 ? void 0 : _restData$gender$codi2.display) || "";
 
@@ -14186,7 +14254,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                       }
                     });
                     info["role"] = restData === null || restData === void 0 ? void 0 : (_restData$practitione = restData.practitioner_role) === null || _restData$practitione === void 0 ? void 0 : (_restData$practitione2 = _restData$practitione[0]) === null || _restData$practitione2 === void 0 ? void 0 : (_restData$practitione3 = _restData$practitione2.role) === null || _restData$practitione3 === void 0 ? void 0 : (_restData$practitione4 = _restData$practitione3.coding) === null || _restData$practitione4 === void 0 ? void 0 : (_restData$practitione5 = _restData$practitione4[0]) === null || _restData$practitione5 === void 0 ? void 0 : _restData$practitione5.display;
-                    info["mobile"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : (_restData$hospital6$t = _restData$hospital6.telecom) === null || _restData$hospital6$t === void 0 ? void 0 : (_restData$hospital6$t2 = _restData$hospital6$t[0]) === null || _restData$hospital6$t2 === void 0 ? void 0 : _restData$hospital6$t2.value;
+                    info["mobile"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : (_restData$hospital6$c = _restData$hospital6.contact) === null || _restData$hospital6$c === void 0 ? void 0 : (_restData$hospital6$c2 = _restData$hospital6$c[0]) === null || _restData$hospital6$c2 === void 0 ? void 0 : (_restData$hospital6$c3 = _restData$hospital6$c2.telecom) === null || _restData$hospital6$c3 === void 0 ? void 0 : (_restData$hospital6$c4 = _restData$hospital6$c3[0]) === null || _restData$hospital6$c4 === void 0 ? void 0 : _restData$hospital6$c4.value;
                     info["experience"] = calculationExp(restData === null || restData === void 0 ? void 0 : restData.job_experience);
                     info["title"] = "".concat(_gender).concat(_gender && " | ").concat(designation);
                     info["gender"] = _gender;
@@ -14196,11 +14264,11 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     })) === null || _restData$qualificati3 === void 0 ? void 0 : _restData$qualificati3.join(", ")) || "----";
                     info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
                     info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital8 = restData.hospital) === null || _restData$hospital8 === void 0 ? void 0 : _restData$hospital8.name) || "";
-                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.line) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital9 = restData.hospital) === null || _restData$hospital9 === void 0 ? void 0 : (_restData$hospital9$a = _restData$hospital9.address) === null || _restData$hospital9$a === void 0 ? void 0 : (_restData$hospital9$a2 = _restData$hospital9$a.city) === null || _restData$hospital9$a2 === void 0 ? void 0 : _restData$hospital9$a2.geogLevelName) || "";
                     var nameObj = (restData === null || restData === void 0 ? void 0 : (_restData$name = restData.name) === null || _restData$name === void 0 ? void 0 : _restData$name[0]) || {};
                     info["name"] = makeName(nameObj);
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$photo = restData.photo) === null || _restData$photo === void 0 ? void 0 : (_restData$photo$ = _restData$photo[0]) === null || _restData$photo$ === void 0 ? void 0 : _restData$photo$.fileid);
-                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address6 = restData.address) === null || _restData$address6 === void 0 ? void 0 : (_restData$address6$ = _restData$address6[0]) === null || _restData$address6$ === void 0 ? void 0 : _restData$address6$.distance) ? "".concat(restData.address[0].distance) : "0";
+                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                     info["bio"] = (restData === null || restData === void 0 ? void 0 : (_restData$biography = restData.biography) === null || _restData$biography === void 0 ? void 0 : (_restData$biography$ = _restData$biography[0]) === null || _restData$biography$ === void 0 ? void 0 : _restData$biography$.biography_description) || "";
                   }
@@ -14211,17 +14279,17 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
             });
           }
 
-          _context2.next = 22;
+          _context.next = 22;
           return getCurrentPosition();
 
         case 22:
-          _yield$getCurrentPosi = _context2.sent;
+          _yield$getCurrentPosi = _context.sent;
           myLat = _yield$getCurrentPosi.lat;
           myLong = _yield$getCurrentPosi["long"];
           locationInfo = {};
 
           if (!(myLat && myLong)) {
-            _context2.next = 31;
+            _context.next = 31;
             break;
           }
 
@@ -14233,7 +14301,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
               "long": myLong
             }, city, locationInfo);
           });
-          _context2.next = 30;
+          _context.next = 30;
           return es6Promise.Promise.all(promArr);
 
         case 30:
@@ -14242,56 +14310,56 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           });
 
         case 31:
-          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData,
             allLangs: _toConsumableArray(allLangs)
           }));
 
         case 34:
-          _context2.prev = 34;
-          _context2.t0 = _context2["catch"](2);
-          console.log(_context2.t0);
-          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context2.t0.message
+          _context.prev = 34;
+          _context.t0 = _context["catch"](2);
+          console.log(_context.t0);
+          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context.t0.message
           })));
 
         case 38:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
     }
-  }, _callee2, null, [[2, 34]]);
+  }, _callee, null, [[2, 34]]);
 }))); // end
 
-var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
+var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,
-      _ref5,
+      _ref4,
       rejectWithValue,
       body,
       data,
       returnData,
-      _args3 = arguments;
+      _args2 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee3$(_context3) {
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
     while (1) {
-      switch (_context3.prev = _context3.next) {
+      switch (_context2.prev = _context2.next) {
         case 0:
-          payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
-          _ref5 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref5.rejectWithValue;
-          _context3.prev = 2;
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
+          _context2.prev = 2;
           body = {
             db_name: dbName,
             entity: "CodeableConceptMaster",
             filter: "CodeableConceptMaster.Type == 'LANGUAGE'",
             return_fields: "{coding_id: CodeableConceptMaster._id, codeable: (let codeable = DOCUMENT(CodeableConceptMaster.coding[0]) RETURN codeable)[0]}"
           };
-          _context3.next = 6;
+          _context2.next = 6;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 6:
-          data = _context3.sent;
+          data = _context2.sent;
           returnData = [];
 
           if (data.result && Array.isArray(data.result)) {
@@ -14305,24 +14373,24 @@ var GET_ALL_LANGS = createAsyncThunk("docterListingReducer/allLanguages", /*#__P
             });
           }
 
-          return _context3.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnData
           }));
 
         case 12:
-          _context3.prev = 12;
-          _context3.t0 = _context3["catch"](2);
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](2);
           console.log(error);
-          return _context3.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: error.message
           })));
 
         case 16:
         case "end":
-          return _context3.stop();
+          return _context2.stop();
       }
     }
-  }, _callee3, null, [[2, 12]]);
+  }, _callee2, null, [[2, 12]]);
 }))); // FUZZY SEARCH CREATE INITIALSTATE
 
 var docterListingReducer = createSlice({
@@ -15156,7 +15224,9 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
           body = {
             db_name: dbName,
             entity: "Practitioner",
-            return_fields: "MERGE(Practitioner,{name:(FOR cod IN TO_ARRAY(Practitioner.name) RETURN DOCUMENT(cod)),SPECIALTY:(FOR spec IN TO_ARRAY(Practitioner.practitioner_role) FOR speccod IN TO_ARRAY( DOCUMENT(spec).SpecialtyID) RETURN MERGE(DOCUMENT(speccod),{coding:(FOR cod IN DOCUMENT(speccod).coding RETURN DOCUMENT(cod))})) })"
+            filter: "Practitioner.activestatus == true && Practitioner.status == true",
+            return_fields: "merge(Practitioner,{name:(for hm in HumanNameMaster filter hm._id in Practitioner.name return merge(hm,{use:(for cod in CodeableConceptMaster filter cod._id== hm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == hm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == hm.suffix return document(cod.coding))}))},{SPECIALTY:(for PractitionerRole in PractitionerRole filter Practitioner.practitioner_role any == PractitionerRole._id for CodeableConceptMaster in CodeableConceptMaster filter PractitionerRole.SpecialtyID == CodeableConceptMaster._id return merge(CodeableConceptMaster,{coding:document(CodeableConceptMaster.coding)}) ) } )",
+            sort: "first(document(Practitioner.name)[*].text)"
           };
           _context11.next = 6;
           return fetchData$3({
@@ -15169,12 +15239,12 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
 
           if (Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
             data === null || data === void 0 ? void 0 : data.result.forEach(function (spec) {
-              var _spec$name, _spec$name$, _spec$SPECIALTY, _spec$SPECIALTY$, _spec$SPECIALTY$$codi, _spec$SPECIALTY$$codi2;
+              var _spec$name, _spec$SPECIALTY, _spec$SPECIALTY$, _spec$SPECIALTY$$codi, _spec$SPECIALTY$$codi2;
 
               returnData.push({
-                label: (_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : (_spec$name$ = _spec$name[0]) === null || _spec$name$ === void 0 ? void 0 : _spec$name$.text,
+                label: makeName((_spec$name = spec.name) === null || _spec$name === void 0 ? void 0 : _spec$name[0]),
                 value: spec.id,
-                type: 'Doctor',
+                type: "Doctor",
                 speciality: spec === null || spec === void 0 ? void 0 : (_spec$SPECIALTY = spec.SPECIALTY) === null || _spec$SPECIALTY === void 0 ? void 0 : (_spec$SPECIALTY$ = _spec$SPECIALTY[0]) === null || _spec$SPECIALTY$ === void 0 ? void 0 : (_spec$SPECIALTY$$codi = _spec$SPECIALTY$.coding) === null || _spec$SPECIALTY$$codi === void 0 ? void 0 : (_spec$SPECIALTY$$codi2 = _spec$SPECIALTY$$codi[0]) === null || _spec$SPECIALTY$$codi2 === void 0 ? void 0 : _spec$SPECIALTY$$codi2.display
               });
             });
@@ -19052,7 +19122,7 @@ var dashboardQuery = {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
           Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
-        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
+        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)}) ,Encounter:merge(keep(adqolcEncounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==adqolcEncounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(adqolcEncounter.status)},{practitioner_details:(for pd in adqolcEncounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in adqolcEncounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(adqolcEncounter.reasonReference)},{participantHistory:(for phy in to_array (adqolcEncounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       },
       reassign: {
         db_name: dbName,
@@ -19061,7 +19131,7 @@ var dashboardQuery = {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
           Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
-        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
+        return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)}) ,Encounter:merge(keep(adqolcEncounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==adqolcEncounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(adqolcEncounter.status)},{practitioner_details:(for pd in adqolcEncounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in adqolcEncounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(adqolcEncounter.reasonReference)},{participantHistory:(for phy in to_array (adqolcEncounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       }
     };
   },
@@ -19170,7 +19240,7 @@ var dashboardQuery = {
         Encounter: "Encounter._key=='".concat(encounter_key, "' && Encounter.activestatus==true && lower(document(Encounter.status).display)=='consultation over'"),
         Appointment: "Appointment.id in Encounter.appointmentId && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end)
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))})"
+      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))})"
     };
   }
 };
@@ -20488,7 +20558,7 @@ var REASON_MASTER = createAsyncThunk("dashboardApiSlice/reasonMaster", /*#__PURE
 })));
 
 var generateReadJSON = function generateReadJSON(data) {
-  var _data$Encounter$visit, _data$Encounter, _data$Encounter2, _data$Encounter3, _data$Encounter$reaso, _data$Encounter4, _data$Encounter4$reas, _data$Appointment, _data$Appointment2, _data$Appointment$con, _data$Appointment3, _data$Appointment4, _data$Appointment5, _data$Appointment6, _data$Appointment6$ap, _data$Encounter$patie, _data$Encounter5, _data$Encounter5$pati, _data$Encounter5$pati2, _data$Encounter5$pati3, _ref43, _data$Encounter6, _data$Encounter6$pati, _data$Encounter6$pati2, _data$Encounter6$pati3, _data$Encounter7, _data$Encounter7$pati, _data$Encounter7$pati2, _data$Encounter7$pati3, _data$Encounter$patie2, _data$Encounter8, _data$Encounter8$pati, _data$Encounter8$pati2, _data$Encounter9, _data$Encounter9$pati, _data$Encounter9$pati2, _data$Encounter9$pati3, _data$Encounter10, _data$Encounter10$pat, _data$Encounter10$pat2, _data$Encounter10$pat3, _data$Encounter11, _data$Encounter11$pat, _data$Encounter11$pat2, _data$Encounter11$pat3, _data$Encounter$patie3, _data$Encounter12, _data$Encounter12$pat, _data$Encounter12$pat2, _data$Encounter$patie4, _data$Encounter13, _data$Encounter13$pat, _data$Encounter13$pat2, _data$Encounter13$pat3, _data$Encounter13$pat4, _data$Encounter$pract, _data$Encounter14, _data$Encounter14$pra, _data$Encounter14$pra2, _data$Encounter14$pra3, _data$Encounter14$pra4, _data$Encounter15, _data$Encounter15$pra, _data$Encounter15$pra2, _data$Encounter16, _data$Encounter16$pra, _data$Encounter16$pra2, _data$Encounter$parti, _data$Encounter17, _data$Encounter17$par, _data$Encounter17$par2, _data$Encounter17$par3, _data$Encounter17$par4, _data$Encounter$parti2, _data$Encounter18, _data$Encounter18$par, _data$Encounter18$par2, _data$Encounter18$par3, _data$Encounter18$par4, _data$Encounter18$par5, _data$Encounter18$par6, _data$Encounter18$par7, _data$Encounter18$par8, _data$Encounter18$par9, _data$Encounter$parti3, _data$Encounter19, _data$Encounter19$par, _data$Encounter19$par2, _data$Encounter19$par3, _data$Encounter19$par4, _data$Encounter19$par5, _data$Encounter19$par6, _data$Encounter$parti4, _data$Encounter20, _data$Encounter20$par, _data$Encounter20$par2, _data$Encounter20$par3, _data$Encounter20$par4, _data$Encounter20$par5, _data$Encounter20$par6, _data$Encounter$parti5, _data$Encounter21, _data$Encounter21$par, _data$Encounter21$par2, _data$Encounter21$par3, _data$Encounter$pract2, _data$Encounter22, _data$Encounter22$pra, _data$Encounter22$pra2, _data$Encounter22$pra3, _data$Encounter22$pra4;
+  var _data$Encounter$visit, _data$Encounter, _data$Encounter2, _data$Encounter3, _data$Encounter$reaso, _data$Encounter4, _data$Encounter4$reas, _data$Appointment, _data$Appointment2, _data$Appointment$con, _data$Appointment3, _data$Appointment4, _data$Appointment4$ap, _data$Appointment5, _data$Appointment6, _data$Appointment6$ap, _data$Encounter$patie, _data$Encounter5, _data$Encounter5$pati, _data$Encounter5$pati2, _data$Encounter5$pati3, _ref43, _data$Encounter6, _data$Encounter6$pati, _data$Encounter6$pati2, _data$Encounter6$pati3, _data$Encounter7, _data$Encounter7$pati, _data$Encounter7$pati2, _data$Encounter7$pati3, _data$Encounter$patie2, _data$Encounter8, _data$Encounter8$pati, _data$Encounter8$pati2, _data$Encounter9, _data$Encounter9$pati, _data$Encounter9$pati2, _data$Encounter9$pati3, _data$Encounter9$pati4, _data$Encounter10, _data$Encounter10$pat, _data$Encounter10$pat2, _data$Encounter10$pat3, _data$Encounter10$pat4, _data$Encounter11, _data$Encounter11$pat, _data$Encounter11$pat2, _data$Encounter11$pat3, _data$Encounter11$pat4, _data$Encounter$patie3, _data$Encounter12, _data$Encounter12$pat, _data$Encounter12$pat2, _data$Encounter$patie4, _data$Encounter13, _data$Encounter13$pat, _data$Encounter13$pat2, _data$Encounter13$pat3, _data$Encounter13$pat4, _data$Encounter$pract, _data$Encounter14, _data$Encounter14$pra, _data$Encounter14$pra2, _data$Encounter14$pra3, _data$Encounter14$pra4, _data$Encounter15, _data$Encounter15$pra, _data$Encounter15$pra2, _data$Encounter16, _data$Encounter16$pra, _data$Encounter16$pra2, _data$Encounter$parti, _data$Encounter17, _data$Encounter17$par, _data$Encounter17$par2, _data$Encounter17$par3, _data$Encounter17$par4, _data$Encounter$parti2, _data$Encounter18, _data$Encounter18$par, _data$Encounter18$par2, _data$Encounter18$par3, _data$Encounter18$par4, _data$Encounter18$par5, _data$Encounter18$par6, _data$Encounter18$par7, _data$Encounter18$par8, _data$Encounter18$par9, _data$Encounter$parti3, _data$Encounter19, _data$Encounter19$par, _data$Encounter19$par2, _data$Encounter19$par3, _data$Encounter19$par4, _data$Encounter19$par5, _data$Encounter19$par6, _data$Encounter$parti4, _data$Encounter20, _data$Encounter20$par, _data$Encounter20$par2, _data$Encounter20$par3, _data$Encounter20$par4, _data$Encounter20$par5, _data$Encounter20$par6, _data$Encounter$parti5, _data$Encounter21, _data$Encounter21$par, _data$Encounter21$par2, _data$Encounter21$par3, _data$Encounter$pract2, _data$Encounter22, _data$Encounter22$pra, _data$Encounter22$pra2, _data$Encounter22$pra3, _data$Encounter22$pra4;
 
   var json = {
     visitType: (_data$Encounter$visit = data === null || data === void 0 ? void 0 : (_data$Encounter = data.Encounter) === null || _data$Encounter === void 0 ? void 0 : _data$Encounter.visit_type) !== null && _data$Encounter$visit !== void 0 ? _data$Encounter$visit : "",
@@ -20496,12 +20566,14 @@ var generateReadJSON = function generateReadJSON(data) {
     reasonCode: (_data$Encounter$reaso = data === null || data === void 0 ? void 0 : (_data$Encounter4 = data.Encounter) === null || _data$Encounter4 === void 0 ? void 0 : (_data$Encounter4$reas = _data$Encounter4.reasonReference) === null || _data$Encounter4$reas === void 0 ? void 0 : _data$Encounter4$reas.display) !== null && _data$Encounter$reaso !== void 0 ? _data$Encounter$reaso : "",
     appointmentDateTime: (data === null || data === void 0 ? void 0 : (_data$Appointment = data.Appointment) === null || _data$Appointment === void 0 ? void 0 : _data$Appointment.start) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Appointment2 = data.Appointment) === null || _data$Appointment2 === void 0 ? void 0 : _data$Appointment2.start, "DD MMM,YYYY hh:mm A") : "",
     consultationMode: (_data$Appointment$con = data === null || data === void 0 ? void 0 : (_data$Appointment3 = data.Appointment) === null || _data$Appointment3 === void 0 ? void 0 : _data$Appointment3.consultationMode) !== null && _data$Appointment$con !== void 0 ? _data$Appointment$con : "",
-    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment4 = data.Appointment) === null || _data$Appointment4 === void 0 ? void 0 : _data$Appointment4.appointmentReason) && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment5 = data.Appointment) === null || _data$Appointment5 === void 0 ? void 0 : _data$Appointment5.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment6 = data.Appointment) === null || _data$Appointment6 === void 0 ? void 0 : (_data$Appointment6$ap = _data$Appointment6.appointmentReason) === null || _data$Appointment6$ap === void 0 ? void 0 : _data$Appointment6$ap.join(",") : "",
+    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment4 = data.Appointment) === null || _data$Appointment4 === void 0 ? void 0 : (_data$Appointment4$ap = _data$Appointment4.appointmentReason) === null || _data$Appointment4$ap === void 0 ? void 0 : _data$Appointment4$ap.length) > 0 && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment5 = data.Appointment) === null || _data$Appointment5 === void 0 ? void 0 : _data$Appointment5.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment6 = data.Appointment) === null || _data$Appointment6 === void 0 ? void 0 : (_data$Appointment6$ap = _data$Appointment6.appointmentReason) === null || _data$Appointment6$ap === void 0 ? void 0 : _data$Appointment6$ap.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v.display;
+    }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie = data === null || data === void 0 ? void 0 : (_data$Encounter5 = data.Encounter) === null || _data$Encounter5 === void 0 ? void 0 : (_data$Encounter5$pati = _data$Encounter5.patient_id) === null || _data$Encounter5$pati === void 0 ? void 0 : (_data$Encounter5$pati2 = _data$Encounter5$pati[0]) === null || _data$Encounter5$pati2 === void 0 ? void 0 : (_data$Encounter5$pati3 = _data$Encounter5$pati2.photo) === null || _data$Encounter5$pati3 === void 0 ? void 0 : _data$Encounter5$pati3[0]) !== null && _data$Encounter$patie !== void 0 ? _data$Encounter$patie : "",
     patientName: (_ref43 = (data === null || data === void 0 ? void 0 : (_data$Encounter6 = data.Encounter) === null || _data$Encounter6 === void 0 ? void 0 : (_data$Encounter6$pati = _data$Encounter6.patient_id) === null || _data$Encounter6$pati === void 0 ? void 0 : (_data$Encounter6$pati2 = _data$Encounter6$pati[0].name) === null || _data$Encounter6$pati2 === void 0 ? void 0 : (_data$Encounter6$pati3 = _data$Encounter6$pati2[0]) === null || _data$Encounter6$pati3 === void 0 ? void 0 : _data$Encounter6$pati3.given) + (data === null || data === void 0 ? void 0 : (_data$Encounter7 = data.Encounter) === null || _data$Encounter7 === void 0 ? void 0 : (_data$Encounter7$pati = _data$Encounter7.patient_id) === null || _data$Encounter7$pati === void 0 ? void 0 : (_data$Encounter7$pati2 = _data$Encounter7$pati[0].name) === null || _data$Encounter7$pati2 === void 0 ? void 0 : (_data$Encounter7$pati3 = _data$Encounter7$pati2[0]) === null || _data$Encounter7$pati3 === void 0 ? void 0 : _data$Encounter7$pati3.family)) !== null && _ref43 !== void 0 ? _ref43 : "",
     patientAge: (_data$Encounter$patie2 = data === null || data === void 0 ? void 0 : (_data$Encounter8 = data.Encounter) === null || _data$Encounter8 === void 0 ? void 0 : (_data$Encounter8$pati = _data$Encounter8.patient_id) === null || _data$Encounter8$pati === void 0 ? void 0 : (_data$Encounter8$pati2 = _data$Encounter8$pati[0]) === null || _data$Encounter8$pati2 === void 0 ? void 0 : _data$Encounter8$pati2.age) !== null && _data$Encounter$patie2 !== void 0 ? _data$Encounter$patie2 : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter9 = data.Encounter) === null || _data$Encounter9 === void 0 ? void 0 : (_data$Encounter9$pati = _data$Encounter9.patient_id) === null || _data$Encounter9$pati === void 0 ? void 0 : (_data$Encounter9$pati2 = _data$Encounter9$pati[0]) === null || _data$Encounter9$pati2 === void 0 ? void 0 : (_data$Encounter9$pati3 = _data$Encounter9$pati2.gender) === null || _data$Encounter9$pati3 === void 0 ? void 0 : _data$Encounter9$pati3.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter10 = data.Encounter) === null || _data$Encounter10 === void 0 ? void 0 : (_data$Encounter10$pat = _data$Encounter10.patient_id) === null || _data$Encounter10$pat === void 0 ? void 0 : (_data$Encounter10$pat2 = _data$Encounter10$pat[0]) === null || _data$Encounter10$pat2 === void 0 ? void 0 : (_data$Encounter10$pat3 = _data$Encounter10$pat2.gender) === null || _data$Encounter10$pat3 === void 0 ? void 0 : _data$Encounter10$pat3.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter11 = data.Encounter) === null || _data$Encounter11 === void 0 ? void 0 : (_data$Encounter11$pat = _data$Encounter11.patient_id) === null || _data$Encounter11$pat === void 0 ? void 0 : (_data$Encounter11$pat2 = _data$Encounter11$pat[0]) === null || _data$Encounter11$pat2 === void 0 ? void 0 : (_data$Encounter11$pat3 = _data$Encounter11$pat2.gender) === null || _data$Encounter11$pat3 === void 0 ? void 0 : _data$Encounter11$pat3.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter9 = data.Encounter) === null || _data$Encounter9 === void 0 ? void 0 : (_data$Encounter9$pati = _data$Encounter9.patient_id) === null || _data$Encounter9$pati === void 0 ? void 0 : (_data$Encounter9$pati2 = _data$Encounter9$pati[0]) === null || _data$Encounter9$pati2 === void 0 ? void 0 : (_data$Encounter9$pati3 = _data$Encounter9$pati2.gender) === null || _data$Encounter9$pati3 === void 0 ? void 0 : (_data$Encounter9$pati4 = _data$Encounter9$pati3.display) === null || _data$Encounter9$pati4 === void 0 ? void 0 : _data$Encounter9$pati4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter10 = data.Encounter) === null || _data$Encounter10 === void 0 ? void 0 : (_data$Encounter10$pat = _data$Encounter10.patient_id) === null || _data$Encounter10$pat === void 0 ? void 0 : (_data$Encounter10$pat2 = _data$Encounter10$pat[0]) === null || _data$Encounter10$pat2 === void 0 ? void 0 : (_data$Encounter10$pat3 = _data$Encounter10$pat2.gender) === null || _data$Encounter10$pat3 === void 0 ? void 0 : (_data$Encounter10$pat4 = _data$Encounter10$pat3.display) === null || _data$Encounter10$pat4 === void 0 ? void 0 : _data$Encounter10$pat4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter11 = data.Encounter) === null || _data$Encounter11 === void 0 ? void 0 : (_data$Encounter11$pat = _data$Encounter11.patient_id) === null || _data$Encounter11$pat === void 0 ? void 0 : (_data$Encounter11$pat2 = _data$Encounter11$pat[0]) === null || _data$Encounter11$pat2 === void 0 ? void 0 : (_data$Encounter11$pat3 = _data$Encounter11$pat2.gender) === null || _data$Encounter11$pat3 === void 0 ? void 0 : (_data$Encounter11$pat4 = _data$Encounter11$pat3.display) === null || _data$Encounter11$pat4 === void 0 ? void 0 : _data$Encounter11$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie3 = data === null || data === void 0 ? void 0 : (_data$Encounter12 = data.Encounter) === null || _data$Encounter12 === void 0 ? void 0 : (_data$Encounter12$pat = _data$Encounter12.patient_id) === null || _data$Encounter12$pat === void 0 ? void 0 : (_data$Encounter12$pat2 = _data$Encounter12$pat[0]) === null || _data$Encounter12$pat2 === void 0 ? void 0 : _data$Encounter12$pat2.MRN) !== null && _data$Encounter$patie3 !== void 0 ? _data$Encounter$patie3 : "",
     patientMobileNumber: (_data$Encounter$patie4 = data === null || data === void 0 ? void 0 : (_data$Encounter13 = data.Encounter) === null || _data$Encounter13 === void 0 ? void 0 : (_data$Encounter13$pat = _data$Encounter13.patient_id) === null || _data$Encounter13$pat === void 0 ? void 0 : (_data$Encounter13$pat2 = _data$Encounter13$pat[0]) === null || _data$Encounter13$pat2 === void 0 ? void 0 : (_data$Encounter13$pat3 = _data$Encounter13$pat2.telecom) === null || _data$Encounter13$pat3 === void 0 ? void 0 : (_data$Encounter13$pat4 = _data$Encounter13$pat3[0]) === null || _data$Encounter13$pat4 === void 0 ? void 0 : _data$Encounter13$pat4.value) !== null && _data$Encounter$patie4 !== void 0 ? _data$Encounter$patie4 : "",
     specialityName: (_data$Encounter$pract = data === null || data === void 0 ? void 0 : (_data$Encounter14 = data.Encounter) === null || _data$Encounter14 === void 0 ? void 0 : (_data$Encounter14$pra = _data$Encounter14.practitioner_details) === null || _data$Encounter14$pra === void 0 ? void 0 : (_data$Encounter14$pra2 = _data$Encounter14$pra[0]) === null || _data$Encounter14$pra2 === void 0 ? void 0 : (_data$Encounter14$pra3 = _data$Encounter14$pra2.speciality[0]) === null || _data$Encounter14$pra3 === void 0 ? void 0 : (_data$Encounter14$pra4 = _data$Encounter14$pra3.coding[0]) === null || _data$Encounter14$pra4 === void 0 ? void 0 : _data$Encounter14$pra4.display) !== null && _data$Encounter$pract !== void 0 ? _data$Encounter$pract : "",
@@ -20575,21 +20647,22 @@ var ASSIGN_LIST = createAsyncThunk("dashboardApiSlice/assignList", /*#__PURE__*/
 })));
 
 var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
-  var _data$Encounter$visit2, _data$Encounter23, _data$Encounter24, _data$Encounter25, _data$Encounter$reaso2, _data$Encounter26, _data$Encounter26$rea, _data$Appointment7, _data$Appointment8, _data$Appointment$con2, _data$Appointment9, _data$Appointment10, _data$Appointment11, _data$Appointment12, _data$Appointment12$a, _data$Encounter$patie5, _data$Encounter27, _data$Encounter27$pat, _data$Encounter27$pat2, _data$Encounter27$pat3, _ref46, _data$Encounter28, _data$Encounter28$pat, _data$Encounter28$pat2, _data$Encounter28$pat3, _data$Encounter29, _data$Encounter29$pat, _data$Encounter29$pat2, _data$Encounter29$pat3, _data$Encounter$patie6, _data$Encounter30, _data$Encounter30$pat, _data$Encounter30$pat2, _data$Encounter31, _data$Encounter31$pat, _data$Encounter31$pat2, _data$Encounter31$pat3, _data$Encounter32, _data$Encounter32$pat, _data$Encounter32$pat2, _data$Encounter32$pat3, _data$Encounter33, _data$Encounter33$pat, _data$Encounter33$pat2, _data$Encounter33$pat3, _data$Encounter$patie7, _data$Encounter34, _data$Encounter34$pat, _data$Encounter34$pat2, _data$Encounter$patie8, _data$Encounter35, _data$Encounter35$pat, _data$Encounter35$pat2, _data$Encounter35$pat3, _data$Encounter35$pat4, _data$Encounter$pract3, _data$Encounter36, _data$Encounter36$pra, _data$Encounter36$pra2, _data$Encounter36$pra3, _data$Encounter36$pra4, _data$Encounter36$pra5, _data$Encounter36$pra6, _data$Encounter37, _data$Encounter37$pra, _data$Encounter37$pra2, _data$Encounter38, _data$Encounter38$pra, _data$Encounter38$pra2, _data$Encounter$parti6, _data$Encounter39, _data$Encounter39$par, _data$Encounter39$par2, _data$Encounter39$par3, _data$Encounter39$par4, _data$Encounter$parti7, _data$Encounter40, _data$Encounter40$par, _data$Encounter40$par2, _data$Encounter40$par3, _data$Encounter40$par4, _data$Encounter40$par5, _data$Encounter40$par6, _data$Encounter40$par7, _data$Encounter40$par8, _data$Encounter40$par9, _data$Encounter40$par10, _data$Encounter$parti8, _data$Encounter41, _data$Encounter41$par, _data$Encounter41$par2, _data$Encounter41$par3, _data$Encounter41$par4, _data$Encounter41$par5, _data$Encounter41$par6, _data$Encounter$parti9, _data$Encounter42, _data$Encounter42$par, _data$Encounter42$par2, _data$Encounter42$par3, _data$Encounter42$par4, _data$Encounter42$par5, _data$Encounter42$par6, _data$Encounter$parti10, _data$Encounter43, _data$Encounter43$par, _data$Encounter43$par2, _data$Encounter43$par3, _data$Encounter$pract4, _data$Encounter44, _data$Encounter44$pra, _data$Encounter44$pra2, _data$Encounter44$pra3, _data$Encounter44$pra4, _data$Encounter45;
+  var _data$Encounter$visit2, _data$Encounter23, _data$Encounter24, _data$Encounter25, _data$Encounter$reaso2, _data$Encounter26, _data$Encounter26$rea, _data$Appointment7, _data$Appointment8, _data$Appointment$con2, _data$Appointment9, _data$Appointment10, _data$Appointment10$a, _data$Appointment11, _data$Appointment12, _data$Appointment12$a, _data$Encounter$patie5, _data$Encounter27, _data$Encounter27$pat, _data$Encounter27$pat2, _data$Encounter27$pat3, _ref46, _data$Encounter28, _data$Encounter28$pat, _data$Encounter28$pat2, _data$Encounter28$pat3, _data$Encounter29, _data$Encounter29$pat, _data$Encounter29$pat2, _data$Encounter29$pat3, _data$Encounter$patie6, _data$Encounter30, _data$Encounter30$pat, _data$Encounter30$pat2, _data$Encounter31, _data$Encounter31$pat, _data$Encounter31$pat2, _data$Encounter31$pat3, _data$Encounter31$pat4, _data$Encounter32, _data$Encounter32$pat, _data$Encounter32$pat2, _data$Encounter32$pat3, _data$Encounter32$pat4, _data$Encounter33, _data$Encounter33$pat, _data$Encounter33$pat2, _data$Encounter33$pat3, _data$Encounter33$pat4, _data$Encounter$patie7, _data$Encounter34, _data$Encounter34$pat, _data$Encounter34$pat2, _data$Encounter$patie8, _data$Encounter35, _data$Encounter35$pat, _data$Encounter35$pat2, _data$Encounter35$pat3, _data$Encounter35$pat4, _data$Encounter$pract3, _data$Encounter36, _data$Encounter36$pra, _data$Encounter36$pra2, _data$Encounter36$pra3, _data$Encounter36$pra4, _data$Encounter36$pra5, _data$Encounter36$pra6, _data$Encounter37, _data$Encounter37$pra, _data$Encounter37$pra2, _data$Encounter38, _data$Encounter38$pra, _data$Encounter38$pra2, _data$Encounter$parti6, _data$Encounter39, _data$Encounter39$par, _data$Encounter39$par2, _data$Encounter39$par3, _data$Encounter39$par4, _data$Encounter$parti7, _data$Encounter40, _data$Encounter40$par, _data$Encounter40$par2, _data$Encounter40$par3, _data$Encounter40$par4, _data$Encounter40$par5, _data$Encounter40$par6, _data$Encounter40$par7, _data$Encounter40$par8, _data$Encounter40$par9, _data$Encounter40$par10, _data$Encounter$parti8, _data$Encounter41, _data$Encounter41$par, _data$Encounter41$par2, _data$Encounter41$par3, _data$Encounter41$par4, _data$Encounter41$par5, _data$Encounter41$par6, _data$Encounter$parti9, _data$Encounter42, _data$Encounter42$par, _data$Encounter42$par2, _data$Encounter42$par3, _data$Encounter42$par4, _data$Encounter42$par5, _data$Encounter42$par6, _data$Encounter$parti10, _data$Encounter43, _data$Encounter43$par, _data$Encounter43$par2, _data$Encounter43$par3, _data$Encounter$pract4, _data$Encounter44, _data$Encounter44$pra, _data$Encounter44$pra2, _data$Encounter44$pra3, _data$Encounter44$pra4, _data$Encounter45;
 
-  debugger;
   var json = {
     visitType: (_data$Encounter$visit2 = data === null || data === void 0 ? void 0 : (_data$Encounter23 = data.Encounter) === null || _data$Encounter23 === void 0 ? void 0 : _data$Encounter23.visit_type) !== null && _data$Encounter$visit2 !== void 0 ? _data$Encounter$visit2 : "",
     encounterDate: (data === null || data === void 0 ? void 0 : (_data$Encounter24 = data.Encounter) === null || _data$Encounter24 === void 0 ? void 0 : _data$Encounter24.encounterdate) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Encounter25 = data.Encounter) === null || _data$Encounter25 === void 0 ? void 0 : _data$Encounter25.encounterdate, "DD MMM,YYYY hh:mm A") : "",
     reasonCode: (_data$Encounter$reaso2 = data === null || data === void 0 ? void 0 : (_data$Encounter26 = data.Encounter) === null || _data$Encounter26 === void 0 ? void 0 : (_data$Encounter26$rea = _data$Encounter26.reasonReference) === null || _data$Encounter26$rea === void 0 ? void 0 : _data$Encounter26$rea.display) !== null && _data$Encounter$reaso2 !== void 0 ? _data$Encounter$reaso2 : "",
     appointmentDateTime: (data === null || data === void 0 ? void 0 : (_data$Appointment7 = data.Appointment) === null || _data$Appointment7 === void 0 ? void 0 : _data$Appointment7.start) ? utcTOLocal$1(data === null || data === void 0 ? void 0 : (_data$Appointment8 = data.Appointment) === null || _data$Appointment8 === void 0 ? void 0 : _data$Appointment8.start, "DD MMM,YYYY hh:mm A") : "",
     consultationMode: (_data$Appointment$con2 = data === null || data === void 0 ? void 0 : (_data$Appointment9 = data.Appointment) === null || _data$Appointment9 === void 0 ? void 0 : _data$Appointment9.consultationMode) !== null && _data$Appointment$con2 !== void 0 ? _data$Appointment$con2 : "",
-    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment10 = data.Appointment) === null || _data$Appointment10 === void 0 ? void 0 : _data$Appointment10.appointmentReason) && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment11 = data.Appointment) === null || _data$Appointment11 === void 0 ? void 0 : _data$Appointment11.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment12 = data.Appointment) === null || _data$Appointment12 === void 0 ? void 0 : (_data$Appointment12$a = _data$Appointment12.appointmentReason) === null || _data$Appointment12$a === void 0 ? void 0 : _data$Appointment12$a.join(",") : "",
+    appointmentReason: (data === null || data === void 0 ? void 0 : (_data$Appointment10 = data.Appointment) === null || _data$Appointment10 === void 0 ? void 0 : (_data$Appointment10$a = _data$Appointment10.appointmentReason) === null || _data$Appointment10$a === void 0 ? void 0 : _data$Appointment10$a.length) > 0 && Array.isArray(data === null || data === void 0 ? void 0 : (_data$Appointment11 = data.Appointment) === null || _data$Appointment11 === void 0 ? void 0 : _data$Appointment11.appointmentReason) ? data === null || data === void 0 ? void 0 : (_data$Appointment12 = data.Appointment) === null || _data$Appointment12 === void 0 ? void 0 : (_data$Appointment12$a = _data$Appointment12.appointmentReason) === null || _data$Appointment12$a === void 0 ? void 0 : _data$Appointment12$a.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v.display;
+    }) : "",
     //PATIENT DEATAIL
     patientPhoto: (_data$Encounter$patie5 = data === null || data === void 0 ? void 0 : (_data$Encounter27 = data.Encounter) === null || _data$Encounter27 === void 0 ? void 0 : (_data$Encounter27$pat = _data$Encounter27.patient_id) === null || _data$Encounter27$pat === void 0 ? void 0 : (_data$Encounter27$pat2 = _data$Encounter27$pat[0]) === null || _data$Encounter27$pat2 === void 0 ? void 0 : (_data$Encounter27$pat3 = _data$Encounter27$pat2.photo) === null || _data$Encounter27$pat3 === void 0 ? void 0 : _data$Encounter27$pat3[0]) !== null && _data$Encounter$patie5 !== void 0 ? _data$Encounter$patie5 : "",
     patientName: (_ref46 = (data === null || data === void 0 ? void 0 : (_data$Encounter28 = data.Encounter) === null || _data$Encounter28 === void 0 ? void 0 : (_data$Encounter28$pat = _data$Encounter28.patient_id) === null || _data$Encounter28$pat === void 0 ? void 0 : (_data$Encounter28$pat2 = _data$Encounter28$pat[0].name) === null || _data$Encounter28$pat2 === void 0 ? void 0 : (_data$Encounter28$pat3 = _data$Encounter28$pat2[0]) === null || _data$Encounter28$pat3 === void 0 ? void 0 : _data$Encounter28$pat3.given) + (data === null || data === void 0 ? void 0 : (_data$Encounter29 = data.Encounter) === null || _data$Encounter29 === void 0 ? void 0 : (_data$Encounter29$pat = _data$Encounter29.patient_id) === null || _data$Encounter29$pat === void 0 ? void 0 : (_data$Encounter29$pat2 = _data$Encounter29$pat[0].name) === null || _data$Encounter29$pat2 === void 0 ? void 0 : (_data$Encounter29$pat3 = _data$Encounter29$pat2[0]) === null || _data$Encounter29$pat3 === void 0 ? void 0 : _data$Encounter29$pat3.family)) !== null && _ref46 !== void 0 ? _ref46 : "",
     patientAge: (_data$Encounter$patie6 = data === null || data === void 0 ? void 0 : (_data$Encounter30 = data.Encounter) === null || _data$Encounter30 === void 0 ? void 0 : (_data$Encounter30$pat = _data$Encounter30.patient_id) === null || _data$Encounter30$pat === void 0 ? void 0 : (_data$Encounter30$pat2 = _data$Encounter30$pat[0]) === null || _data$Encounter30$pat2 === void 0 ? void 0 : _data$Encounter30$pat2.age) !== null && _data$Encounter$patie6 !== void 0 ? _data$Encounter$patie6 : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter31 = data.Encounter) === null || _data$Encounter31 === void 0 ? void 0 : (_data$Encounter31$pat = _data$Encounter31.patient_id) === null || _data$Encounter31$pat === void 0 ? void 0 : (_data$Encounter31$pat2 = _data$Encounter31$pat[0]) === null || _data$Encounter31$pat2 === void 0 ? void 0 : (_data$Encounter31$pat3 = _data$Encounter31$pat2.gender) === null || _data$Encounter31$pat3 === void 0 ? void 0 : _data$Encounter31$pat3.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter32 = data.Encounter) === null || _data$Encounter32 === void 0 ? void 0 : (_data$Encounter32$pat = _data$Encounter32.patient_id) === null || _data$Encounter32$pat === void 0 ? void 0 : (_data$Encounter32$pat2 = _data$Encounter32$pat[0]) === null || _data$Encounter32$pat2 === void 0 ? void 0 : (_data$Encounter32$pat3 = _data$Encounter32$pat2.gender) === null || _data$Encounter32$pat3 === void 0 ? void 0 : _data$Encounter32$pat3.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter33 = data.Encounter) === null || _data$Encounter33 === void 0 ? void 0 : (_data$Encounter33$pat = _data$Encounter33.patient_id) === null || _data$Encounter33$pat === void 0 ? void 0 : (_data$Encounter33$pat2 = _data$Encounter33$pat[0]) === null || _data$Encounter33$pat2 === void 0 ? void 0 : (_data$Encounter33$pat3 = _data$Encounter33$pat2.gender) === null || _data$Encounter33$pat3 === void 0 ? void 0 : _data$Encounter33$pat3.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$Encounter31 = data.Encounter) === null || _data$Encounter31 === void 0 ? void 0 : (_data$Encounter31$pat = _data$Encounter31.patient_id) === null || _data$Encounter31$pat === void 0 ? void 0 : (_data$Encounter31$pat2 = _data$Encounter31$pat[0]) === null || _data$Encounter31$pat2 === void 0 ? void 0 : (_data$Encounter31$pat3 = _data$Encounter31$pat2.gender) === null || _data$Encounter31$pat3 === void 0 ? void 0 : (_data$Encounter31$pat4 = _data$Encounter31$pat3.display) === null || _data$Encounter31$pat4 === void 0 ? void 0 : _data$Encounter31$pat4.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$Encounter32 = data.Encounter) === null || _data$Encounter32 === void 0 ? void 0 : (_data$Encounter32$pat = _data$Encounter32.patient_id) === null || _data$Encounter32$pat === void 0 ? void 0 : (_data$Encounter32$pat2 = _data$Encounter32$pat[0]) === null || _data$Encounter32$pat2 === void 0 ? void 0 : (_data$Encounter32$pat3 = _data$Encounter32$pat2.gender) === null || _data$Encounter32$pat3 === void 0 ? void 0 : (_data$Encounter32$pat4 = _data$Encounter32$pat3.display) === null || _data$Encounter32$pat4 === void 0 ? void 0 : _data$Encounter32$pat4.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$Encounter33 = data.Encounter) === null || _data$Encounter33 === void 0 ? void 0 : (_data$Encounter33$pat = _data$Encounter33.patient_id) === null || _data$Encounter33$pat === void 0 ? void 0 : (_data$Encounter33$pat2 = _data$Encounter33$pat[0]) === null || _data$Encounter33$pat2 === void 0 ? void 0 : (_data$Encounter33$pat3 = _data$Encounter33$pat2.gender) === null || _data$Encounter33$pat3 === void 0 ? void 0 : (_data$Encounter33$pat4 = _data$Encounter33$pat3.display) === null || _data$Encounter33$pat4 === void 0 ? void 0 : _data$Encounter33$pat4.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$Encounter$patie7 = data === null || data === void 0 ? void 0 : (_data$Encounter34 = data.Encounter) === null || _data$Encounter34 === void 0 ? void 0 : (_data$Encounter34$pat = _data$Encounter34.patient_id) === null || _data$Encounter34$pat === void 0 ? void 0 : (_data$Encounter34$pat2 = _data$Encounter34$pat[0]) === null || _data$Encounter34$pat2 === void 0 ? void 0 : _data$Encounter34$pat2.MRN) !== null && _data$Encounter$patie7 !== void 0 ? _data$Encounter$patie7 : "",
     patientMobileNumber: (_data$Encounter$patie8 = data === null || data === void 0 ? void 0 : (_data$Encounter35 = data.Encounter) === null || _data$Encounter35 === void 0 ? void 0 : (_data$Encounter35$pat = _data$Encounter35.patient_id) === null || _data$Encounter35$pat === void 0 ? void 0 : (_data$Encounter35$pat2 = _data$Encounter35$pat[0]) === null || _data$Encounter35$pat2 === void 0 ? void 0 : (_data$Encounter35$pat3 = _data$Encounter35$pat2.telecom) === null || _data$Encounter35$pat3 === void 0 ? void 0 : (_data$Encounter35$pat4 = _data$Encounter35$pat3[0]) === null || _data$Encounter35$pat4 === void 0 ? void 0 : _data$Encounter35$pat4.value) !== null && _data$Encounter$patie8 !== void 0 ? _data$Encounter$patie8 : "",
     specialityName: (_data$Encounter$pract3 = data === null || data === void 0 ? void 0 : (_data$Encounter36 = data.Encounter) === null || _data$Encounter36 === void 0 ? void 0 : (_data$Encounter36$pra = _data$Encounter36.practitioner_details) === null || _data$Encounter36$pra === void 0 ? void 0 : (_data$Encounter36$pra2 = _data$Encounter36$pra[0]) === null || _data$Encounter36$pra2 === void 0 ? void 0 : (_data$Encounter36$pra3 = _data$Encounter36$pra2.speciality) === null || _data$Encounter36$pra3 === void 0 ? void 0 : (_data$Encounter36$pra4 = _data$Encounter36$pra3[0]) === null || _data$Encounter36$pra4 === void 0 ? void 0 : (_data$Encounter36$pra5 = _data$Encounter36$pra4.coding) === null || _data$Encounter36$pra5 === void 0 ? void 0 : (_data$Encounter36$pra6 = _data$Encounter36$pra5[0]) === null || _data$Encounter36$pra6 === void 0 ? void 0 : _data$Encounter36$pra6.display) !== null && _data$Encounter$pract3 !== void 0 ? _data$Encounter$pract3 : "",
@@ -20609,7 +20682,7 @@ var generateReadJSON_Reassign = function generateReadJSON_Reassign(data) {
 };
 
 var generateReadJSON_colseConsultation = function generateReadJSON_colseConsultation(data) {
-  var _data$visit_type, _data$reasonReference, _data$reasonReference2, _data$appointmentId, _data$appointmentId2, _data$appointmentId$c, _data$appointmentId3, _data$appointmentId4, _data$appointmentId4$, _data$appointmentId5, _data$appointmentId6, _data$appointmentId6$, _data$patient_id$0$ph, _data$patient_id, _data$patient_id$, _data$patient_id$$pho, _ref47, _data$patient_id2, _data$patient_id2$0$n, _data$patient_id2$0$n2, _data$patient_id3, _data$patient_id3$0$n, _data$patient_id3$0$n2, _data$patient_id$0$ag, _data$patient_id4, _data$patient_id4$, _data$patient_id5, _data$patient_id5$, _data$patient_id5$$ge, _data$patient_id6, _data$patient_id6$, _data$patient_id6$$ge, _data$patient_id7, _data$patient_id7$, _data$patient_id7$$ge, _data$patient_id$0$al, _data$patient_id8, _data$patient_id8$, _data$patient_id$0$te, _data$patient_id9, _data$patient_id9$, _data$patient_id9$$te, _data$patient_id9$$te2, _data$practitioner_de, _data$practitioner_de2, _data$practitioner_de3, _data$practitioner_de4, _data$practitioner_de5, _data$practitioner_de6, _data$practitioner_de7, _data$practitioner_de8, _data$practitioner_de9, _data$practitioner_de10, _data$practitioner_de11;
+  var _data$visit_type, _data$reasonReference, _data$reasonReference2, _data$appointmentId, _data$appointmentId2, _data$appointmentId$c, _data$appointmentId3, _data$appointmentId4, _data$appointmentId4$, _data$appointmentId5, _data$appointmentId6, _data$appointmentId6$, _data$patient_id$0$ph, _data$patient_id, _data$patient_id$, _data$patient_id$$pho, _ref47, _data$patient_id2, _data$patient_id2$0$n, _data$patient_id2$0$n2, _data$patient_id3, _data$patient_id3$0$n, _data$patient_id3$0$n2, _data$patient_id$0$ag, _data$patient_id4, _data$patient_id4$, _data$patient_id5, _data$patient_id5$, _data$patient_id5$$ge, _data$patient_id5$$ge2, _data$patient_id6, _data$patient_id6$, _data$patient_id6$$ge, _data$patient_id6$$ge2, _data$patient_id7, _data$patient_id7$, _data$patient_id7$$ge, _data$patient_id7$$ge2, _data$patient_id$0$al, _data$patient_id8, _data$patient_id8$, _data$patient_id$0$te, _data$patient_id9, _data$patient_id9$, _data$patient_id9$$te, _data$patient_id9$$te2, _data$practitioner_de, _data$practitioner_de2, _data$practitioner_de3, _data$practitioner_de4, _data$practitioner_de5, _data$practitioner_de6, _data$practitioner_de7, _data$practitioner_de8, _data$practitioner_de9, _data$practitioner_de10, _data$practitioner_de11, _data$practitioner_de12, _data$practitioner_de13, _data$practitioner_de14;
 
   var json = {
     visitType: (_data$visit_type = data === null || data === void 0 ? void 0 : data.visit_type) !== null && _data$visit_type !== void 0 ? _data$visit_type : "",
@@ -20625,7 +20698,7 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     // need to expand
     patientName: (_ref47 = (data === null || data === void 0 ? void 0 : (_data$patient_id2 = data.patient_id) === null || _data$patient_id2 === void 0 ? void 0 : (_data$patient_id2$0$n = _data$patient_id2[0].name) === null || _data$patient_id2$0$n === void 0 ? void 0 : (_data$patient_id2$0$n2 = _data$patient_id2$0$n[0]) === null || _data$patient_id2$0$n2 === void 0 ? void 0 : _data$patient_id2$0$n2.given) + (data === null || data === void 0 ? void 0 : (_data$patient_id3 = data.patient_id) === null || _data$patient_id3 === void 0 ? void 0 : (_data$patient_id3$0$n = _data$patient_id3[0].name) === null || _data$patient_id3$0$n === void 0 ? void 0 : (_data$patient_id3$0$n2 = _data$patient_id3$0$n[0]) === null || _data$patient_id3$0$n2 === void 0 ? void 0 : _data$patient_id3$0$n2.family)) !== null && _ref47 !== void 0 ? _ref47 : "",
     patientAge: (_data$patient_id$0$ag = data === null || data === void 0 ? void 0 : (_data$patient_id4 = data.patient_id) === null || _data$patient_id4 === void 0 ? void 0 : (_data$patient_id4$ = _data$patient_id4[0]) === null || _data$patient_id4$ === void 0 ? void 0 : _data$patient_id4$.age) !== null && _data$patient_id$0$ag !== void 0 ? _data$patient_id$0$ag : "",
-    patientGender: (data === null || data === void 0 ? void 0 : (_data$patient_id5 = data.patient_id) === null || _data$patient_id5 === void 0 ? void 0 : (_data$patient_id5$ = _data$patient_id5[0]) === null || _data$patient_id5$ === void 0 ? void 0 : (_data$patient_id5$$ge = _data$patient_id5$.gender) === null || _data$patient_id5$$ge === void 0 ? void 0 : _data$patient_id5$$ge.display) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$patient_id6 = data.patient_id) === null || _data$patient_id6 === void 0 ? void 0 : (_data$patient_id6$ = _data$patient_id6[0]) === null || _data$patient_id6$ === void 0 ? void 0 : (_data$patient_id6$$ge = _data$patient_id6$.gender) === null || _data$patient_id6$$ge === void 0 ? void 0 : _data$patient_id6$$ge.display) === "OTHER" ? "O" : (data === null || data === void 0 ? void 0 : (_data$patient_id7 = data.patient_id) === null || _data$patient_id7 === void 0 ? void 0 : (_data$patient_id7$ = _data$patient_id7[0]) === null || _data$patient_id7$ === void 0 ? void 0 : (_data$patient_id7$$ge = _data$patient_id7$.gender) === null || _data$patient_id7$$ge === void 0 ? void 0 : _data$patient_id7$$ge.display) === "female" ? "F" : "",
+    patientGender: (data === null || data === void 0 ? void 0 : (_data$patient_id5 = data.patient_id) === null || _data$patient_id5 === void 0 ? void 0 : (_data$patient_id5$ = _data$patient_id5[0]) === null || _data$patient_id5$ === void 0 ? void 0 : (_data$patient_id5$$ge = _data$patient_id5$.gender) === null || _data$patient_id5$$ge === void 0 ? void 0 : (_data$patient_id5$$ge2 = _data$patient_id5$$ge.display) === null || _data$patient_id5$$ge2 === void 0 ? void 0 : _data$patient_id5$$ge2.toLowerCase()) === "male" ? "M" : (data === null || data === void 0 ? void 0 : (_data$patient_id6 = data.patient_id) === null || _data$patient_id6 === void 0 ? void 0 : (_data$patient_id6$ = _data$patient_id6[0]) === null || _data$patient_id6$ === void 0 ? void 0 : (_data$patient_id6$$ge = _data$patient_id6$.gender) === null || _data$patient_id6$$ge === void 0 ? void 0 : (_data$patient_id6$$ge2 = _data$patient_id6$$ge.display) === null || _data$patient_id6$$ge2 === void 0 ? void 0 : _data$patient_id6$$ge2.toLowerCase()) === "other" ? "O" : (data === null || data === void 0 ? void 0 : (_data$patient_id7 = data.patient_id) === null || _data$patient_id7 === void 0 ? void 0 : (_data$patient_id7$ = _data$patient_id7[0]) === null || _data$patient_id7$ === void 0 ? void 0 : (_data$patient_id7$$ge = _data$patient_id7$.gender) === null || _data$patient_id7$$ge === void 0 ? void 0 : (_data$patient_id7$$ge2 = _data$patient_id7$$ge.display) === null || _data$patient_id7$$ge2 === void 0 ? void 0 : _data$patient_id7$$ge2.toLowerCase()) === "female" ? "F" : "",
     patientMRN: (_data$patient_id$0$al = data === null || data === void 0 ? void 0 : (_data$patient_id8 = data.patient_id) === null || _data$patient_id8 === void 0 ? void 0 : (_data$patient_id8$ = _data$patient_id8[0]) === null || _data$patient_id8$ === void 0 ? void 0 : _data$patient_id8$.alias) !== null && _data$patient_id$0$al !== void 0 ? _data$patient_id$0$al : "",
     patientMobileNumber: (_data$patient_id$0$te = data === null || data === void 0 ? void 0 : (_data$patient_id9 = data.patient_id) === null || _data$patient_id9 === void 0 ? void 0 : (_data$patient_id9$ = _data$patient_id9[0]) === null || _data$patient_id9$ === void 0 ? void 0 : (_data$patient_id9$$te = _data$patient_id9$.telecom) === null || _data$patient_id9$$te === void 0 ? void 0 : (_data$patient_id9$$te2 = _data$patient_id9$$te[0]) === null || _data$patient_id9$$te2 === void 0 ? void 0 : _data$patient_id9$$te2.value) !== null && _data$patient_id$0$te !== void 0 ? _data$patient_id$0$te : "",
     specialityName: (_data$practitioner_de = data === null || data === void 0 ? void 0 : (_data$practitioner_de2 = data.practitioner_details) === null || _data$practitioner_de2 === void 0 ? void 0 : (_data$practitioner_de3 = _data$practitioner_de2[0]) === null || _data$practitioner_de3 === void 0 ? void 0 : (_data$practitioner_de4 = _data$practitioner_de3.speciality) === null || _data$practitioner_de4 === void 0 ? void 0 : (_data$practitioner_de5 = _data$practitioner_de4[0]) === null || _data$practitioner_de5 === void 0 ? void 0 : (_data$practitioner_de6 = _data$practitioner_de5.coding) === null || _data$practitioner_de6 === void 0 ? void 0 : (_data$practitioner_de7 = _data$practitioner_de6[0]) === null || _data$practitioner_de7 === void 0 ? void 0 : _data$practitioner_de7.display) !== null && _data$practitioner_de !== void 0 ? _data$practitioner_de : "",
@@ -20637,9 +20710,7 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     // practitionerRole:
     //   data?.Encounter?.participant?.[0]?.Practitioner_id?.[0]
     //     ?.practitioner_role?.[0]?.role?.[0].coding?.[0]?.display ?? "",
-    // practitioner:
-    //   data?.Encounter?.participant?.[0]?.Practitioner_id?.[0]?.name?.[0]
-    //     ?.text ?? "",
+    practitioner: (_data$practitioner_de12 = data === null || data === void 0 ? void 0 : (_data$practitioner_de13 = data.practitioner_details) === null || _data$practitioner_de13 === void 0 ? void 0 : (_data$practitioner_de14 = _data$practitioner_de13[0]) === null || _data$practitioner_de14 === void 0 ? void 0 : _data$practitioner_de14.id_name) !== null && _data$practitioner_de12 !== void 0 ? _data$practitioner_de12 : "",
     //FOR ASSIGN QUERY
     // practroleId:
     //   data?.participant?.[0]?.Practitioner_id?.[0]
@@ -22645,8 +22716,9 @@ var queries$8 = {
     return {
       db_name: dbName,
       entity: "Diagnosis",
-      filter: "Diagnosis.icdname LIKE '%".concat(input_text, "%'"),
-      return_fields: "{_id:Diagnosis._id,icdcode:Diagnosis.icdcode,icdname:Diagnosis.icdname}"
+      filter: "Diagnosis.icdname LIKE '%".concat(input_text, "%' && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)"),
+      return_fields: "{_id:Diagnosis._id,icdcode:Diagnosis.icdcode,icdname:Diagnosis.icdname}",
+      sort: "Diagnosis.icdname"
     };
   },
   Diagnosis_value: function Diagnosis_value(id) {
@@ -38533,7 +38605,7 @@ var GET_OTHER_VISITS = createAsyncThunk("appointmentStatsApiSlice/getOtherVisits
         case 5:
           data = _context3.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result3 = data.result) === null || _data$result3 === void 0 ? void 0 : _data$result3.map(function (_) {
-            var _$Encounter9, _$Encounter9$patient_, _$Encounter9$patient_2, _$Encounter9$patient_3, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Appointment19, _$Appointment19$Perso, _$Appointment19$Perso2, _$Appointment20, _$Appointment21, _$Appointment22, _$Appointment23, _$Encounter11, _$Encounter12, _$Encounter12$status, _$Encounter$appointme3, _$Encounter13, _$Encounter13$appoint, _$Encounter$appointme4, _$Encounter14, _$Encounter14$appoint, _$Encounter15, _$Encounter15$patient, _$Encounter15$patient2, _$Encounter15$patient3, _$Encounter15$patient4, _$Appointment$PersonI5, _$Appointment24, _$Appointment24$Perso, _$Appointment24$Perso2, _$Encounter$patient_i5, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2;
+            var _$Encounter9, _$Encounter9$patient_, _$Encounter9$patient_2, _$Encounter9$patient_3, _$Encounter10, _$Encounter10$patient, _$Encounter10$patient2, _$Appointment19, _$Appointment19$Perso, _$Appointment19$Perso2, _$Appointment20, _$Appointment21, _$Appointment22, _$Appointment23, _$Encounter11, _$Encounter$status$di2, _$Encounter12, _$Encounter12$status, _$Encounter$appointme3, _$Encounter13, _$Encounter13$appoint, _$Encounter$appointme4, _$Encounter14, _$Encounter14$appoint, _$Encounter15, _$Encounter15$patient, _$Encounter15$patient2, _$Encounter15$patient3, _$Encounter15$patient4, _$Appointment$PersonI5, _$Appointment24, _$Appointment24$Perso, _$Appointment24$Perso2, _$Encounter$patient_i5, _$Encounter16, _$Encounter16$patient, _$Encounter16$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38570,7 +38642,7 @@ var GET_OTHER_VISITS = createAsyncThunk("appointmentStatsApiSlice/getOtherVisits
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment19 = _.Appointment) === null || _$Appointment19 === void 0 ? void 0 : (_$Appointment19$Perso = _$Appointment19.PersonID) === null || _$Appointment19$Perso === void 0 ? void 0 : (_$Appointment19$Perso2 = _$Appointment19$Perso[0]) === null || _$Appointment19$Perso2 === void 0 ? void 0 : _$Appointment19$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment20 = _.Appointment) === null || _$Appointment20 === void 0 ? void 0 : _$Appointment20.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment21 = _.Appointment) === null || _$Appointment21 === void 0 ? void 0 : _$Appointment21.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment22 = _.Appointment) === null || _$Appointment22 === void 0 ? void 0 : _$Appointment22.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment23 = _.Appointment) === null || _$Appointment23 === void 0 ? void 0 : _$Appointment23.start, "hh:mm A") : ""),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter11 = _.Encounter) === null || _$Encounter11 === void 0 ? void 0 : _$Encounter11.visit_type,
-              appointmentStatus: _ === 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,
+              appointmentStatus: (_$Encounter$status$di2 = _ === null || _ === void 0 ? void 0 : (_$Encounter12 = _.Encounter) === null || _$Encounter12 === void 0 ? void 0 : (_$Encounter12$status = _$Encounter12.status) === null || _$Encounter12$status === void 0 ? void 0 : _$Encounter12$status.display) !== null && _$Encounter$status$di2 !== void 0 ? _$Encounter$status$di2 : "",
               refNo: (_$Encounter$appointme3 = _ === null || _ === void 0 ? void 0 : (_$Encounter13 = _.Encounter) === null || _$Encounter13 === void 0 ? void 0 : (_$Encounter13$appoint = _$Encounter13.appointmentId) === null || _$Encounter13$appoint === void 0 ? void 0 : _$Encounter13$appoint[0]) !== null && _$Encounter$appointme3 !== void 0 ? _$Encounter$appointme3 : "",
               action: JSON.stringify({
                 appNo: (_$Encounter$appointme4 = _ === null || _ === void 0 ? void 0 : (_$Encounter14 = _.Encounter) === null || _$Encounter14 === void 0 ? void 0 : (_$Encounter14$appoint = _$Encounter14.appointmentId) === null || _$Encounter14$appoint === void 0 ? void 0 : _$Encounter14$appoint[0]) !== null && _$Encounter$appointme4 !== void 0 ? _$Encounter$appointme4 : "",
@@ -38637,7 +38709,7 @@ var GET_WALK_INS = createAsyncThunk("appointmentStatsApiSlice/getWalkIns", /*#__
         case 5:
           data = _context4.sent;
           returnedData = (data === null || data === void 0 ? void 0 : data.result) ? data === null || data === void 0 ? void 0 : (_data$result4 = data.result) === null || _data$result4 === void 0 ? void 0 : _data$result4.map(function (_) {
-            var _$Encounter17, _$Encounter17$patient, _$Encounter17$patient2, _$Encounter17$patient3, _$Encounter18, _$Encounter18$patient, _$Encounter18$patient2, _$Appointment25, _$Appointment25$Perso, _$Appointment25$Perso2, _$Appointment26, _$Appointment27, _$Appointment28, _$Appointment29, _$Encounter19, _$Encounter20, _$Encounter20$status, _$Encounter$appointme5, _$Encounter21, _$Encounter21$appoint, _$Encounter$appointme6, _$Encounter22, _$Encounter22$appoint, _$Encounter23, _$Encounter23$patient, _$Encounter23$patient2, _$Encounter23$patient3, _$Encounter23$patient4, _$Appointment$PersonI6, _$Appointment30, _$Appointment30$Perso, _$Appointment30$Perso2, _$Encounter$patient_i6, _$Encounter24, _$Encounter24$patient, _$Encounter24$patient2;
+            var _$Encounter17, _$Encounter17$patient, _$Encounter17$patient2, _$Encounter17$patient3, _$Encounter18, _$Encounter18$patient, _$Encounter18$patient2, _$Appointment25, _$Appointment25$Perso, _$Appointment25$Perso2, _$Appointment26, _$Appointment27, _$Appointment28, _$Appointment29, _$Encounter19, _$Encounter$status$di3, _$Encounter20, _$Encounter20$status, _$Encounter$appointme5, _$Encounter21, _$Encounter21$appoint, _$Encounter$appointme6, _$Encounter22, _$Encounter22$appoint, _$Encounter23, _$Encounter23$patient, _$Encounter23$patient2, _$Encounter23$patient3, _$Encounter23$patient4, _$Appointment$PersonI6, _$Appointment30, _$Appointment30$Perso, _$Appointment30$Perso2, _$Encounter$patient_i6, _$Encounter24, _$Encounter24$patient, _$Encounter24$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38674,7 +38746,7 @@ var GET_WALK_INS = createAsyncThunk("appointmentStatsApiSlice/getWalkIns", /*#__
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment25 = _.Appointment) === null || _$Appointment25 === void 0 ? void 0 : (_$Appointment25$Perso = _$Appointment25.PersonID) === null || _$Appointment25$Perso === void 0 ? void 0 : (_$Appointment25$Perso2 = _$Appointment25$Perso[0]) === null || _$Appointment25$Perso2 === void 0 ? void 0 : _$Appointment25$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment26 = _.Appointment) === null || _$Appointment26 === void 0 ? void 0 : _$Appointment26.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment27 = _.Appointment) === null || _$Appointment27 === void 0 ? void 0 : _$Appointment27.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment28 = _.Appointment) === null || _$Appointment28 === void 0 ? void 0 : _$Appointment28.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment29 = _.Appointment) === null || _$Appointment29 === void 0 ? void 0 : _$Appointment29.start, "hh:mm A") : ""),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter19 = _.Encounter) === null || _$Encounter19 === void 0 ? void 0 : _$Encounter19.visit_type,
-              appointmentStatus: _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$status = _$Encounter20.status) === null || _$Encounter20$status === void 0 ? void 0 : _$Encounter20$status.display,
+              appointmentStatus: (_$Encounter$status$di3 = _ === null || _ === void 0 ? void 0 : (_$Encounter20 = _.Encounter) === null || _$Encounter20 === void 0 ? void 0 : (_$Encounter20$status = _$Encounter20.status) === null || _$Encounter20$status === void 0 ? void 0 : _$Encounter20$status.display) !== null && _$Encounter$status$di3 !== void 0 ? _$Encounter$status$di3 : "",
               refNo: (_$Encounter$appointme5 = _ === null || _ === void 0 ? void 0 : (_$Encounter21 = _.Encounter) === null || _$Encounter21 === void 0 ? void 0 : (_$Encounter21$appoint = _$Encounter21.appointmentId) === null || _$Encounter21$appoint === void 0 ? void 0 : _$Encounter21$appoint[0]) !== null && _$Encounter$appointme5 !== void 0 ? _$Encounter$appointme5 : "",
               action: JSON.stringify({
                 appNo: (_$Encounter$appointme6 = _ === null || _ === void 0 ? void 0 : (_$Encounter22 = _.Encounter) === null || _$Encounter22 === void 0 ? void 0 : (_$Encounter22$appoint = _$Encounter22.appointmentId) === null || _$Encounter22$appoint === void 0 ? void 0 : _$Encounter22$appoint[0]) !== null && _$Encounter$appointme6 !== void 0 ? _$Encounter$appointme6 : "",
@@ -38741,7 +38813,7 @@ 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 _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter25$patient3, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Appointment31, _$Appointment31$Perso, _$Appointment31$Perso2, _$Appointment32, _$Appointment33, _$Appointment34, _$Appointment35, _$Encounter27, _$Encounter$status$di2, _$Encounter28, _$Encounter28$status, _$Encounter$appointme7, _$Encounter29, _$Encounter29$appoint, _$Encounter$appointme8, _$Encounter30, _$Encounter30$appoint, _$Encounter31, _$Encounter31$patient, _$Encounter31$patient2, _$Encounter31$patient3, _$Encounter31$patient4, _$Appointment$PersonI7, _$Appointment36, _$Appointment36$Perso, _$Appointment36$Perso2, _$Encounter$patient_i7, _$Encounter32, _$Encounter32$patient, _$Encounter32$patient2;
+            var _$Encounter25, _$Encounter25$patient, _$Encounter25$patient2, _$Encounter25$patient3, _$Encounter26, _$Encounter26$patient, _$Encounter26$patient2, _$Appointment31, _$Appointment31$Perso, _$Appointment31$Perso2, _$Appointment32, _$Appointment33, _$Appointment34, _$Appointment35, _$Encounter27, _$Encounter$status$di4, _$Encounter28, _$Encounter28$status, _$Encounter$appointme7, _$Encounter29, _$Encounter29$appoint, _$Encounter$appointme8, _$Encounter30, _$Encounter30$appoint, _$Encounter31, _$Encounter31$patient, _$Encounter31$patient2, _$Encounter31$patient3, _$Encounter31$patient4, _$Appointment$PersonI7, _$Appointment36, _$Appointment36$Perso, _$Appointment36$Perso2, _$Encounter$patient_i7, _$Encounter32, _$Encounter32$patient, _$Encounter32$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38778,7 +38850,7 @@ var GET_NEW_PATIENTS = createAsyncThunk("appointmentStatsApiSlice/getNewPatients
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment31 = _.Appointment) === null || _$Appointment31 === void 0 ? void 0 : (_$Appointment31$Perso = _$Appointment31.PersonID) === null || _$Appointment31$Perso === void 0 ? void 0 : (_$Appointment31$Perso2 = _$Appointment31$Perso[0]) === null || _$Appointment31$Perso2 === void 0 ? void 0 : _$Appointment31$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment32 = _.Appointment) === null || _$Appointment32 === void 0 ? void 0 : _$Appointment32.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment33 = _.Appointment) === null || _$Appointment33 === void 0 ? void 0 : _$Appointment33.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment34 = _.Appointment) === null || _$Appointment34 === void 0 ? void 0 : _$Appointment34.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment35 = _.Appointment) === null || _$Appointment35 === void 0 ? void 0 : _$Appointment35.start, "hh:mm A") : ""),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter27 = _.Encounter) === null || _$Encounter27 === void 0 ? void 0 : _$Encounter27.visit_type,
-              appointmentStatus: (_$Encounter$status$di2 = _ === null || _ === void 0 ? void 0 : (_$Encounter28 = _.Encounter) === null || _$Encounter28 === void 0 ? void 0 : (_$Encounter28$status = _$Encounter28.status) === null || _$Encounter28$status === void 0 ? void 0 : _$Encounter28$status.display) !== null && _$Encounter$status$di2 !== void 0 ? _$Encounter$status$di2 : "",
+              appointmentStatus: (_$Encounter$status$di4 = _ === null || _ === void 0 ? void 0 : (_$Encounter28 = _.Encounter) === null || _$Encounter28 === void 0 ? void 0 : (_$Encounter28$status = _$Encounter28.status) === null || _$Encounter28$status === void 0 ? void 0 : _$Encounter28$status.display) !== null && _$Encounter$status$di4 !== void 0 ? _$Encounter$status$di4 : "",
               refNo: (_$Encounter$appointme7 = _ === null || _ === void 0 ? void 0 : (_$Encounter29 = _.Encounter) === null || _$Encounter29 === void 0 ? void 0 : (_$Encounter29$appoint = _$Encounter29.appointmentId) === null || _$Encounter29$appoint === void 0 ? void 0 : _$Encounter29$appoint[0]) !== null && _$Encounter$appointme7 !== void 0 ? _$Encounter$appointme7 : "",
               action: JSON.stringify({
                 appNo: (_$Encounter$appointme8 = _ === null || _ === void 0 ? void 0 : (_$Encounter30 = _.Encounter) === null || _$Encounter30 === void 0 ? void 0 : (_$Encounter30$appoint = _$Encounter30.appointmentId) === null || _$Encounter30$appoint === void 0 ? void 0 : _$Encounter30$appoint[0]) !== null && _$Encounter$appointme8 !== void 0 ? _$Encounter$appointme8 : "",
@@ -38845,7 +38917,7 @@ 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 _$Encounter33, _$Encounter33$patient, _$Encounter33$patient2, _$Encounter33$patient3, _$Encounter34, _$Encounter34$patient, _$Encounter34$patient2, _$Appointment37, _$Appointment37$Perso, _$Appointment37$Perso2, _$Appointment38, _$Appointment39, _$Appointment40, _$Appointment41, _$Encounter35, _$Encounter36, _$Encounter36$status, _$Encounter$appointme9, _$Encounter37, _$Encounter37$appoint, _$Encounter$appointme10, _$Encounter38, _$Encounter38$appoint, _$Encounter39, _$Encounter39$patient, _$Encounter39$patient2, _$Encounter39$patient3, _$Encounter39$patient4, _$Appointment$PersonI8, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Encounter$patient_i8, _$Encounter40, _$Encounter40$patient, _$Encounter40$patient2;
+            var _$Encounter33, _$Encounter33$patient, _$Encounter33$patient2, _$Encounter33$patient3, _$Encounter34, _$Encounter34$patient, _$Encounter34$patient2, _$Appointment37, _$Appointment37$Perso, _$Appointment37$Perso2, _$Appointment38, _$Appointment39, _$Appointment40, _$Appointment41, _$Encounter35, _$Encounter$status$di5, _$Encounter36, _$Encounter36$status, _$Encounter$appointme9, _$Encounter37, _$Encounter37$appoint, _$Encounter$appointme10, _$Encounter38, _$Encounter38$appoint, _$Encounter39, _$Encounter39$patient, _$Encounter39$patient2, _$Encounter39$patient3, _$Encounter39$patient4, _$Appointment$PersonI8, _$Appointment42, _$Appointment42$Perso, _$Appointment42$Perso2, _$Encounter$patient_i8, _$Encounter40, _$Encounter40$patient, _$Encounter40$patient2;
 
             return {
               // img: _?.Appointment?.PersonID?.[0]?.photo?.[0]?.fileid
@@ -38882,7 +38954,7 @@ var GET_TODAY_VISITS = createAsyncThunk("appointmentStatsApiSlice/getTodayVisits
               age: getAge(_ === null || _ === void 0 ? void 0 : (_$Appointment37 = _.Appointment) === null || _$Appointment37 === void 0 ? void 0 : (_$Appointment37$Perso = _$Appointment37.PersonID) === null || _$Appointment37$Perso === void 0 ? void 0 : (_$Appointment37$Perso2 = _$Appointment37$Perso[0]) === null || _$Appointment37$Perso2 === void 0 ? void 0 : _$Appointment37$Perso2.birthDay),
               date: "".concat((_ === null || _ === void 0 ? void 0 : (_$Appointment38 = _.Appointment) === null || _$Appointment38 === void 0 ? void 0 : _$Appointment38.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment39 = _.Appointment) === null || _$Appointment39 === void 0 ? void 0 : _$Appointment39.start, "DD MMM,YYYY") : "", ",").concat((_ === null || _ === void 0 ? void 0 : (_$Appointment40 = _.Appointment) === null || _$Appointment40 === void 0 ? void 0 : _$Appointment40.start) ? utcTOLocal$1(_ === null || _ === void 0 ? void 0 : (_$Appointment41 = _.Appointment) === null || _$Appointment41 === void 0 ? void 0 : _$Appointment41.start, "hh:mm A") : ""),
               visitType: _ === null || _ === void 0 ? void 0 : (_$Encounter35 = _.Encounter) === null || _$Encounter35 === void 0 ? void 0 : _$Encounter35.visit_type,
-              appointmentStatus: _ === 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,
+              appointmentStatus: (_$Encounter$status$di5 = _ === null || _ === void 0 ? void 0 : (_$Encounter36 = _.Encounter) === null || _$Encounter36 === void 0 ? void 0 : (_$Encounter36$status = _$Encounter36.status) === null || _$Encounter36$status === void 0 ? void 0 : _$Encounter36$status.display) !== null && _$Encounter$status$di5 !== void 0 ? _$Encounter$status$di5 : "",
               refNo: (_$Encounter$appointme9 = _ === null || _ === void 0 ? void 0 : (_$Encounter37 = _.Encounter) === null || _$Encounter37 === void 0 ? void 0 : (_$Encounter37$appoint = _$Encounter37.appointmentId) === null || _$Encounter37$appoint === void 0 ? void 0 : _$Encounter37$appoint[0]) !== null && _$Encounter$appointme9 !== void 0 ? _$Encounter$appointme9 : "",
               action: JSON.stringify({
                 appNo: (_$Encounter$appointme10 = _ === null || _ === void 0 ? void 0 : (_$Encounter38 = _.Encounter) === null || _$Encounter38 === void 0 ? void 0 : (_$Encounter38$appoint = _$Encounter38.appointmentId) === null || _$Encounter38$appoint === void 0 ? void 0 : _$Encounter38$appoint[0]) !== null && _$Encounter$appointme10 !== void 0 ? _$Encounter$appointme10 : "",
@@ -41533,9 +41605,9 @@ var orderSetDropDown = {
   },
   diagnosisDropDown: function diagnosisDropDown(type) {
     return {
-      db_name: dbName,
+      db_name: "primarycare",
       entity: "Diagnosis",
-      filter: "Diagnosis.icdcode != Diagnosis.parenticdcode && like (Diagnosis.icdname,'%".concat(type, "%',true)"),
+      filter: "Diagnosis.icdcode != Diagnosis.parenticdcode && like (Diagnosis.icdname,'%".concat(type, "%',true) && (round(DATE_TIMESTAMP(DATE_ADD(DATE_NOW(), -1, 'day'))/1000)<=Diagnosis.effTo || Diagnosis.effTo==null)"),
       return_fields: "KEEP(Diagnosis,'_id','id','_key','icdcode', 'icdname', 'parenticdcode', 'levelnumber')",
       sort: "Diagnosis.icdname"
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primarycare-binder",
-  "version": "1.1.43",
+  "version": "1.1.45",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",