primarycare-binder 1.1.13 → 1.1.17

package/dist/index.cjs.js

@@ -8016,7 +8016,7 @@ var query_ids = {
         "db_name": dbName,
         "entity": "Schedule",
         "filter": "Schedule.start >= ".concat(start, " AND Schedule.end <= ").concat(end, " AND Schedule.activestatus == true AND DOCUMENT(Schedule.resourceCode).id == ").concat(id),
-        "return_fields": "MERGE(Schedule, {slots : (FOR slt IN Slot FILTER Schedule.id IN slt.ScheduleID AND slt.status!='blocked' AND slt.start >= ".concat(moment().unix(), " AND slt.activestatus==true sort slt._id asc RETURN slt)})")
+        "return_fields": "MERGE(Schedule, {slots : (FOR slt IN Slot FILTER Schedule.id IN slt.ScheduleID AND slt.status!='blocked' AND slt.start >= ".concat(moment().unix(), " AND slt.activestatus==true sort slt._id asc RETURN merge(slt, {DayType: Document(slt.DayType)}))})")
       };
     } // query: ({ start, end, id }) => ({
     //   "db_name": dbName,
@@ -8084,7 +8084,7 @@ var queries$a = {
         Encounter: "Encounter.appointmentId == [".concat(appointmentId, "]"),
         Patient: "Patient.id == Encounter.patient_id"
       },
-      "return_fields": "merge(Encounter,{patient_id:(for p in Patient.identifier return merge(Patient,{identifier:document(p),name:document(Patient.name),telecom:document(Patient.telecom),photo:document(Patient.photo),martialStatus:document(Patient.maritalstatus)}))})"
+      return_fields: "merge(Encounter,{statusexpand:document(Encounter.status),patient_id:(for p in Patient.identifier return merge(Patient,{identifier:document(p),name:document(Patient.name),telecom:document(Patient.telecom),photo:document(Patient.photo),martialStatus:document(Patient.maritalstatus)}))})"
     };
   },
   visitmodify: {
@@ -9534,6 +9534,141 @@ var getImgUrl = function getImgUrl(fileId) {
   return fileId ? "".concat(__imgdownloadBaseUrl__).concat(fileId) : "";
 };
 
+var deg2rad = function deg2rad(deg) {
+  return deg * (Math.PI / 180);
+};
+
+var getDisctanceFromLatLonInKm = function getDisctanceFromLatLonInKm(lat1, lon1, lat2, lon2) {
+  var R = 6371; // Radius of the earth in km
+
+  var dLat = deg2rad(lat2 - lat1); // deg2rad below
+
+  var dLon = deg2rad(lon2 - lon1);
+  var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) + Math.cos(deg2rad(lat1)) * Math.cos(deg2rad(lat2)) * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+  var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+  var d = R * c; // Distance in km
+
+  return parseFloat(d).toFixed(2);
+};
+
+var getLocation = function getLocation() {
+  return new es6Promise.Promise(function (resolve, reject) {
+    navigator.geolocation.getCurrentPosition(function (position) {
+      var lat = position.coords.latitude;
+      var _long = position.coords.longitude;
+      resolve([false, {
+        lat: lat,
+        "long": _long
+      }]);
+    }, function (error) {
+      resolve([true, error]);
+    });
+  });
+};
+
+var getCurrentPosition = /*#__PURE__*/function () {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+    var permission, lat, _long2, _yield$getLocation, _yield$getLocation2, err, currLocation;
+
+    return regeneratorRuntime.wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return navigator.permissions.query({
+              name: 'geolocation'
+            })["catch"](function (err) {
+              return {
+                state: 'denied'
+              };
+            });
+
+          case 2:
+            permission = _context2.sent;
+
+            if (!(permission.state !== 'denied')) {
+              _context2.next = 11;
+              break;
+            }
+
+            _context2.next = 6;
+            return getLocation();
+
+          case 6:
+            _yield$getLocation = _context2.sent;
+            _yield$getLocation2 = _slicedToArray(_yield$getLocation, 2);
+            err = _yield$getLocation2[0];
+            currLocation = _yield$getLocation2[1];
+
+            if (!err) {
+              lat = currLocation.lat;
+              _long2 = currLocation["long"];
+            }
+
+          case 11:
+            return _context2.abrupt("return", {
+              lat: lat,
+              "long": _long2
+            });
+
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+
+  return function getCurrentPosition() {
+    return _ref4.apply(this, arguments);
+  };
+}();
+
+var getLatLong = /*#__PURE__*/function () {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(city) {
+    var _resp$results, _resp$results$, _resp$results$$geomet, _resp$results$$geomet2, _resp$results2, _resp$results2$, _resp$results2$$geome, _resp$results2$$geome2;
+
+    var url, data, resp, lat, _long3, _resp$results3, _resp$results3$, _resp$results3$$geome, _resp$results3$$geome2, _resp$results4, _resp$results4$, _resp$results4$$geome, _resp$results4$$geome2;
+
+    return regeneratorRuntime.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            url = "https://maps.googleapis.com/maps/api/geocode/json?address=".concat(city, "&key=AIzaSyBqeACJgp12OLU6EkHeUtFgya2naH1LhrU");
+            _context3.next = 3;
+            return fetch(url);
+
+          case 3:
+            data = _context3.sent;
+            _context3.next = 6;
+            return data.json();
+
+          case 6:
+            resp = _context3.sent;
+
+            if ((resp === null || resp === void 0 ? void 0 : (_resp$results = resp.results) === null || _resp$results === void 0 ? void 0 : (_resp$results$ = _resp$results[0]) === null || _resp$results$ === void 0 ? void 0 : (_resp$results$$geomet = _resp$results$.geometry) === null || _resp$results$$geomet === void 0 ? void 0 : (_resp$results$$geomet2 = _resp$results$$geomet.location) === null || _resp$results$$geomet2 === void 0 ? void 0 : _resp$results$$geomet2.lat) && (resp === null || resp === void 0 ? void 0 : (_resp$results2 = resp.results) === null || _resp$results2 === void 0 ? void 0 : (_resp$results2$ = _resp$results2[0]) === null || _resp$results2$ === void 0 ? void 0 : (_resp$results2$$geome = _resp$results2$.geometry) === null || _resp$results2$$geome === void 0 ? void 0 : (_resp$results2$$geome2 = _resp$results2$$geome.location) === null || _resp$results2$$geome2 === void 0 ? void 0 : _resp$results2$$geome2.lng)) {
+              lat = resp === null || resp === void 0 ? void 0 : (_resp$results3 = resp.results) === null || _resp$results3 === void 0 ? void 0 : (_resp$results3$ = _resp$results3[0]) === null || _resp$results3$ === void 0 ? void 0 : (_resp$results3$$geome = _resp$results3$.geometry) === null || _resp$results3$$geome === void 0 ? void 0 : (_resp$results3$$geome2 = _resp$results3$$geome.location) === null || _resp$results3$$geome2 === void 0 ? void 0 : _resp$results3$$geome2.lat;
+              _long3 = resp === null || resp === void 0 ? void 0 : (_resp$results4 = resp.results) === null || _resp$results4 === void 0 ? void 0 : (_resp$results4$ = _resp$results4[0]) === null || _resp$results4$ === void 0 ? void 0 : (_resp$results4$$geome = _resp$results4$.geometry) === null || _resp$results4$$geome === void 0 ? void 0 : (_resp$results4$$geome2 = _resp$results4$$geome.location) === null || _resp$results4$$geome2 === void 0 ? void 0 : _resp$results4$$geome2.lng;
+            }
+
+            return _context3.abrupt("return", {
+              lat: lat,
+              "long": _long3
+            });
+
+          case 9:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  }));
+
+  return function getLatLong(_x2) {
+    return _ref5.apply(this, arguments);
+  };
+}();
+
 var _extraReducers$C;
 var __options$8 = {
   method: "POST",
@@ -10636,7 +10771,7 @@ var APPOINTMENT_UPDATE = createAsyncThunk("appointmentReducer/updateAppointment"
             break;
           }
 
-          throw new Error(data.error && (typeof data.error === "string" ? data.error : data.message));
+          throw new Error(data.error && (typeof data.error === "string" ? data.error : data.message || data.errorMessage));
 
         case 9:
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -11162,7 +11297,7 @@ var GET__FOLLOW_UP_APPOINTMENT = createAsyncThunk("appointmentReducer/follow_up_
             db_name: dbName,
             entity: "AppointmentRequest",
             filter: "AppointmentRequest.patientid=='".concat(patientId, "' and DATE_TIMESTAMP(DATE_ADD(AppointmentRequest.encounterdate*1000,AppointmentRequest.followupdurval,DOCUMENT(AppointmentRequest.followupduruom).display=='Days'?'day':DOCUMENT(AppointmentRequest.followupduruom).display=='month'?'month':'week'))>=DATE_TIMESTAMP(DATE_NOW())"),
-            return_fields: "merge(AppointmentRequest,{encounterid:(for e in Encounter filter e._id == AppointmentRequest.encounterid return merge(e,{appointmentId:(for app in Appointment filter app.id in e.appointmentId return app.consultationMode)}))},{followupduruom:document(AppointmentRequest.followupduruom)},{followupreason:document(AppointmentRequest.followupreason)},{healthserviceid:to_array(document(AppointmentRequest.healthserviceid))},{orgid:to_array(document(AppointmentRequest.orgid))},{practitionerid:(for doc in Practitioner filter doc._id == AppointmentRequest.practitionerid return merge(doc,{name:(for name in HumanNameMaster filter name._id in doc.name return merge(name,{use:(document(name.use))},{prefix:(document(name.prefix))},{suffix:document(name.suffix)}))},{practitioner_role:(for pr in PractitionerRole filter pr._id in doc.practitioner_role return merge(pr,{role:document(pr.role)}))}))},{patientid:(for pat in Patient filter pat._id == AppointmentRequest.patientid return merge (pat,{name:(for name in HumanNameMaster filter name._id in pat.name return merge(name,{use:(document(name.use))},{prefix:(document(name.prefix))},{suffix:document(name.suffix)}))}))},{specialtyid:document(AppointmentRequest.specialtyid)})"
+            return_fields: "merge(AppointmentRequest,{encounterid:(for e in Encounter filter e._id == AppointmentRequest.encounterid return merge(e,{appointmentId:(for app in Appointment filter app.id in e.appointmentId return app.consultationMode)}))},{followupduruom:document(AppointmentRequest.followupduruom)},{followupreason:document(AppointmentRequest.followupreason)},{healthserviceid:to_array(document(AppointmentRequest.healthserviceid))},{orgid:to_array(document(AppointmentRequest.orgid))}, {practitionerid:(for doc in Practitioner filter doc._id == AppointmentRequest.practitionerid return merge(doc,{name:(for name in HumanNameMaster filter name._id in doc.name return merge(name,{use:document(name.use)},{prefix:merge(document(name.prefix),{coding:document(document(name.prefix).coding)})},{suffix:merge(document(name.suffix),{coding:document(document(name.suffix).coding)})}))}, {practitioner_role:(for pr in PractitionerRole filter pr._id in doc.practitioner_role return merge(pr,{role:document(pr.role)}))},{photo:document(doc.photo)}))}, {patientid:(for pat in Patient filter pat._id == AppointmentRequest.patientid return merge (pat,{name:(for name in HumanNameMaster filter name._id in pat.name return merge(name,{use:(document(name.use))},{prefix:(document(name.prefix))},{suffix:document(name.suffix)}))}))},{specialtyid:document(AppointmentRequest.specialtyid)})"
           }; // const body = {
           //   "db_name": dbName,
           //   "entity": "AppointmentRequest",
@@ -13521,9 +13656,53 @@ var practitionerReducer$1 = practitionerReducer.reducer;
 
 var _extraReducers$x;
 
-var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+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);
+  };
+}(); // DOCTER_LISTING
+
+
+var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
   var payload,
-      _ref2,
+      _ref3,
       rejectWithValue,
       date,
       startTime,
@@ -13538,15 +13717,21 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
       data,
       returnData,
       allLangs,
-      _args = arguments;
+      allCities,
+      _yield$getCurrentPosi,
+      myLat,
+      myLong,
+      locationInfo,
+      promArr,
+      _args2 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee$(_context) {
+  return regeneratorRuntime.wrap(function _callee2$(_context2) {
     while (1) {
-      switch (_context.prev = _context.next) {
+      switch (_context2.prev = _context2.next) {
         case 0:
-          payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
-          _context.prev = 2;
+          payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
+          _ref3 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref3.rejectWithValue;
+          _context2.prev = 2;
           date = new Date();
 
           if (payload.date) {
@@ -13597,15 +13782,16 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
           // }
 
 
-          _context.next = 12;
+          _context2.next = 12;
           return fetchData$3({
             body: JSON.stringify(body)
           });
 
         case 12:
-          data = _context.sent;
+          data = _context2.sent;
           returnData = [];
           allLangs = new Set();
+          allCities = new Set();
 
           if (Array.isArray(data) && Array.isArray(data[0])) {
             data[0].forEach(function (record) {
@@ -13617,7 +13803,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     restData = _objectWithoutProperties(record, ["OrgType", "id", "_id", "displayresource"]);
 
                 if (displayresource) {
-                  var _OrgType$some, _restData$locationID, _restData$hospital2, _OrgType$, _restData$hospital3, _restData$hospital3$O, _restData$hospital4;
+                  var _OrgType$some, _restData$address, _restData$address$cit, _restData$hospital2, _restData$hospital2$a, _restData$hospital2$a2, _restData$locationID, _restData$hospital3, _OrgType$, _restData$hospital4, _restData$hospital4$O, _restData$hospital5;
 
                   var resourceInfo = {
                     resourcetype: "",
@@ -13669,6 +13855,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                   //     isClinic,
                   // );
 
+                  var city = (restData === null || restData === void 0 ? void 0 : (_restData$address = restData.address) === null || _restData$address === void 0 ? void 0 : (_restData$address$cit = _restData$address.city) === null || _restData$address$cit === void 0 ? void 0 : _restData$address$cit.geogLevelName) || (restData === null || restData === void 0 ? void 0 : (_restData$hospital2 = restData.hospital) === null || _restData$hospital2 === void 0 ? void 0 : (_restData$hospital2$a = _restData$hospital2.address) === null || _restData$hospital2$a === void 0 ? void 0 : (_restData$hospital2$a2 = _restData$hospital2$a.city) === null || _restData$hospital2$a2 === void 0 ? void 0 : _restData$hospital2$a2.geogLevelName) || "";
+                  allCities.add(city);
                   var info = {
                     clinicId: (restData === null || restData === void 0 ? void 0 : (_restData$locationID = restData.locationID) === null || _restData$locationID === void 0 ? void 0 : _restData$locationID.id) || 0,
                     id: id,
@@ -13683,6 +13871,7 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     hospitalName: "",
                     hospitalLocation: "",
                     kms: "0 Kms",
+                    city: city,
                     weekCalendar: payload.date && payload.date * 1000 || Date.now(),
                     isAllSession: isClinic,
                     allSession: allSession,
@@ -13696,15 +13885,15 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     resourceInfo: resourceInfo,
                     specialities: [],
                     healthCareId: healthCareId,
-                    orgId: isClinic ? id : restData === null || restData === void 0 ? void 0 : (_restData$hospital2 = restData.hospital) === null || _restData$hospital2 === void 0 ? void 0 : _restData$hospital2.id,
-                    orgType: isClinic ? OrgType === null || OrgType === void 0 ? void 0 : (_OrgType$ = OrgType[0]) === null || _OrgType$ === void 0 ? void 0 : _OrgType$._id : restData === null || restData === void 0 ? void 0 : (_restData$hospital3 = restData.hospital) === null || _restData$hospital3 === void 0 ? void 0 : (_restData$hospital3$O = _restData$hospital3.OrgType) === null || _restData$hospital3$O === void 0 ? void 0 : _restData$hospital3$O[0],
-                    org_Id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : (_restData$hospital4 = restData.hospital) === null || _restData$hospital4 === void 0 ? void 0 : _restData$hospital4._id,
+                    orgId: isClinic ? id : restData === null || restData === void 0 ? void 0 : (_restData$hospital3 = restData.hospital) === null || _restData$hospital3 === void 0 ? void 0 : _restData$hospital3.id,
+                    orgType: isClinic ? OrgType === null || OrgType === void 0 ? void 0 : (_OrgType$ = OrgType[0]) === null || _OrgType$ === void 0 ? void 0 : _OrgType$._id : restData === null || restData === void 0 ? void 0 : (_restData$hospital4 = restData.hospital) === null || _restData$hospital4 === void 0 ? void 0 : (_restData$hospital4$O = _restData$hospital4.OrgType) === null || _restData$hospital4$O === void 0 ? void 0 : _restData$hospital4$O[0],
+                    org_Id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : (_restData$hospital5 = restData.hospital) === null || _restData$hospital5 === void 0 ? void 0 : _restData$hospital5._id,
                     _id: isClinic ? _id : restData === null || restData === void 0 ? void 0 : restData._id,
                     _key: restData === null || restData === void 0 ? void 0 : restData._key
                   };
 
                   if (isClinic) {
-                    var _restData$clinics5, _restData$clinics5$, _s$Type, _restData$locationID2, _restData$address, _restData$address$, _restData$address2, _restData$address2$, _restData$Practitione, _restData$address3, _restData$address3$, _restData$locationID3, _restData$locationID4, _restData$locationID5;
+                    var _restData$clinics5, _restData$clinics5$, _s$Type, _restData$locationID2, _restData$address2, _restData$address2$, _restData$address3, _restData$address3$, _restData$Practitione, _restData$address4, _restData$address4$, _restData$locationID3, _restData$locationID4, _restData$locationID5;
 
                     var s = restData === null || restData === void 0 ? void 0 : (_restData$clinics5 = restData.clinics) === null || _restData$clinics5 === void 0 ? void 0 : (_restData$clinics5$ = _restData$clinics5[0]) === null || _restData$clinics5$ === void 0 ? void 0 : _restData$clinics5$.Specialties;
 
@@ -13725,8 +13914,8 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
 
                     info["name"] = (restData === null || restData === void 0 ? void 0 : (_restData$locationID2 = restData.locationID) === null || _restData$locationID2 === void 0 ? void 0 : _restData$locationID2.shortdesc) || "";
                     info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : restData.name) || "";
-                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address = restData.address) === null || _restData$address === void 0 ? void 0 : (_restData$address$ = _restData$address[0]) === null || _restData$address$ === void 0 ? void 0 : _restData$address$.line) || "";
-                    info["title"] = (restData === null || restData === void 0 ? void 0 : (_restData$address2 = restData.address) === null || _restData$address2 === void 0 ? void 0 : (_restData$address2$ = _restData$address2[0]) === null || _restData$address2$ === void 0 ? void 0 : _restData$address2$.line) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address2 = restData.address) === null || _restData$address2 === void 0 ? void 0 : (_restData$address2$ = _restData$address2[0]) === null || _restData$address2$ === void 0 ? void 0 : _restData$address2$.line) || "";
+                    info["title"] = (restData === null || restData === void 0 ? void 0 : (_restData$address3 = restData.address) === null || _restData$address3 === void 0 ? void 0 : (_restData$address3$ = _restData$address3[0]) === null || _restData$address3$ === void 0 ? void 0 : _restData$address3$.line) || "";
                     info["gender"] = null;
                     info["memberIncludes"] = restData === null || restData === void 0 ? void 0 : restData.member_count;
                     info["memberIncludesImg"] = restData === null || restData === void 0 ? void 0 : (_restData$Practitione = restData.Practitioner) === null || _restData$Practitione === void 0 ? void 0 : _restData$Practitione.map(function (p) {
@@ -13738,11 +13927,11 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
 
                       return "";
                     });
-                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address3 = restData.address) === null || _restData$address3 === void 0 ? void 0 : (_restData$address3$ = _restData$address3[0]) === null || _restData$address3$ === void 0 ? void 0 : _restData$address3$.distance) ? "".concat(restData.address[0].distance) : "0";
+                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address4 = restData.address) === null || _restData$address4 === void 0 ? void 0 : (_restData$address4$ = _restData$address4[0]) === null || _restData$address4$ === void 0 ? void 0 : _restData$address4$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$locationID3 = restData.locationID) === null || _restData$locationID3 === void 0 ? void 0 : (_restData$locationID4 = _restData$locationID3.photo) === null || _restData$locationID4 === void 0 ? void 0 : (_restData$locationID5 = _restData$locationID4[0]) === null || _restData$locationID5 === void 0 ? void 0 : _restData$locationID5.fileid);
                   } else {
-                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital5, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital6, _restData$address4, _restData$address4$, _restData$name, _restData$photo, _restData$photo$, _restData$address5, _restData$address5$;
+                    var _restData$gender, _restData$gender$codi, _restData$gender$codi2, _restData$Specialties, _restData$communicati, _restData$hospital6, _restData$qualificati, _restData$qualificati2, _restData$qualificati3, _restData$hospital7, _restData$address5, _restData$address5$, _restData$name, _restData$photo, _restData$photo$, _restData$address6, _restData$address6$;
 
                     var gender = (restData === null || restData === void 0 ? void 0 : (_restData$gender = restData.gender) === null || _restData$gender === void 0 ? void 0 : (_restData$gender$codi = _restData$gender.coding) === null || _restData$gender$codi === void 0 ? void 0 : (_restData$gender$codi2 = _restData$gender$codi[0]) === null || _restData$gender$codi2 === void 0 ? void 0 : _restData$gender$codi2.display) || "";
                     var designation = "";
@@ -13782,17 +13971,17 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
                     });
                     info["title"] = "".concat(gender).concat(gender && " | ").concat(designation);
                     info["gender"] = gender;
-                    info["hospId"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital5 = restData.hospital) === null || _restData$hospital5 === void 0 ? void 0 : _restData$hospital5.id;
+                    info["hospId"] = restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : _restData$hospital6.id;
                     info["subtext"] = (restData === null || restData === void 0 ? void 0 : (_restData$qualificati = restData.qualification) === null || _restData$qualificati === void 0 ? void 0 : (_restData$qualificati2 = _restData$qualificati.map) === null || _restData$qualificati2 === void 0 ? void 0 : (_restData$qualificati3 = _restData$qualificati2.call(_restData$qualificati, function (q) {
                       return (q === null || q === void 0 ? void 0 : q.name) || "";
                     })) === null || _restData$qualificati3 === void 0 ? void 0 : _restData$qualificati3.join(", ")) || "MBBS";
                     info["language"] = languages.size > 0 ? _toConsumableArray(languages) : [];
-                    info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital6 = restData.hospital) === null || _restData$hospital6 === void 0 ? void 0 : _restData$hospital6.name) || "";
-                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address4 = restData.address) === null || _restData$address4 === void 0 ? void 0 : (_restData$address4$ = _restData$address4[0]) === null || _restData$address4$ === void 0 ? void 0 : _restData$address4$.line) || "";
+                    info["hospitalName"] = (restData === null || restData === void 0 ? void 0 : (_restData$hospital7 = restData.hospital) === null || _restData$hospital7 === void 0 ? void 0 : _restData$hospital7.name) || "";
+                    info["hospitalLocation"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.line) || "";
                     var nameObj = (restData === null || restData === void 0 ? void 0 : (_restData$name = restData.name) === null || _restData$name === void 0 ? void 0 : _restData$name[0]) || {};
                     info["name"] = makeName(nameObj);
                     info["img"] = getImgUrl(restData === null || restData === void 0 ? void 0 : (_restData$photo = restData.photo) === null || _restData$photo === void 0 ? void 0 : (_restData$photo$ = _restData$photo[0]) === null || _restData$photo$ === void 0 ? void 0 : _restData$photo$.fileid);
-                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address5 = restData.address) === null || _restData$address5 === void 0 ? void 0 : (_restData$address5$ = _restData$address5[0]) === null || _restData$address5$ === void 0 ? void 0 : _restData$address5$.distance) ? "".concat(restData.address[0].distance) : "0";
+                    info["kms"] = (restData === null || restData === void 0 ? void 0 : (_restData$address6 = restData.address) === null || _restData$address6 === void 0 ? void 0 : (_restData$address6$ = _restData$address6[0]) === null || _restData$address6$ === void 0 ? void 0 : _restData$address6$.distance) ? "".concat(restData.address[0].distance) : "0";
                     info["key"] = restData === null || restData === void 0 ? void 0 : restData._key;
                   }
 
@@ -13802,25 +13991,56 @@ var DOCTER_LISTING = createAsyncThunk("docterListingReducer/docterListing", /*#_
             });
           }
 
-          return _context.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          _context2.next = 19;
+          return getCurrentPosition();
+
+        case 19:
+          _yield$getCurrentPosi = _context2.sent;
+          myLat = _yield$getCurrentPosi.lat;
+          myLong = _yield$getCurrentPosi["long"];
+          locationInfo = {};
+
+          if (!(myLat && myLong)) {
+            _context2.next = 28;
+            break;
+          }
+
+          promArr = _toConsumableArray(allCities).filter(function (c) {
+            return !!c;
+          }).map(function (city) {
+            return getLocationInfo$1({
+              lat: myLat,
+              "long": myLong
+            }, city, locationInfo);
+          });
+          _context2.next = 27;
+          return es6Promise.Promise.all(promArr);
+
+        case 27:
+          returnData.forEach(function (d) {
+            d.kms = locationInfo[d.city] || "0 Kms";
+          });
+
+        case 28:
+          return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData,
             allLangs: _toConsumableArray(allLangs)
           }));
 
-        case 19:
-          _context.prev = 19;
-          _context.t0 = _context["catch"](2);
-          console.log(_context.t0);
-          return _context.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context.t0.message
+        case 31:
+          _context2.prev = 31;
+          _context2.t0 = _context2["catch"](2);
+          console.log(_context2.t0);
+          return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context2.t0.message
           })));
 
-        case 23:
+        case 35:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
     }
-  }, _callee, null, [[2, 19]]);
+  }, _callee2, null, [[2, 31]]);
 }))); // end
 // FUZZY SEARCH CREATE INITIALSTATE
 
@@ -14105,6 +14325,9 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
       location,
       body,
       data,
+      _yield$getCurrentPosi,
+      lat,
+      _long,
       returnData,
       _args4 = arguments;
 
@@ -14115,7 +14338,7 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
           payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
           _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
           _context4.prev = 2;
-          _payload$city2 = payload.city, city = _payload$city2 === void 0 ? "" : _payload$city2, _payload$location = payload.location, location = _payload$location === void 0 ? "" : _payload$location;
+          _payload$city2 = payload.city, city = _payload$city2 === void 0 ? "" : _payload$city2, _payload$location = payload.location, location = _payload$location === void 0 ? {} : _payload$location;
           body = {
             db_name: dbName,
             queryid: query_ids["searhcApiSlice/getHospitals"],
@@ -14133,6 +14356,13 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
 
         case 7:
           data = _context4.sent;
+          _context4.next = 10;
+          return getCurrentPosition();
+
+        case 10:
+          _yield$getCurrentPosi = _context4.sent;
+          lat = _yield$getCurrentPosi.lat;
+          _long = _yield$getCurrentPosi["long"];
           returnData = [];
 
           if (Array.isArray(data)) {
@@ -14140,11 +14370,18 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
               if (hospInfo.id && hospInfo.name) {
                 var _hospInfo$address, _hospInfo$address2;
 
+                var distance = "";
+
+                if (lat && _long) {
+                  distance = getDisctanceFromLatLonInKm(lat, _long, location.latitude, location.longitude) + " KM";
+                }
+
                 returnData.push({
                   value: hospInfo.id,
                   label: hospInfo.name,
                   lat: hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address = hospInfo.address) === null || _hospInfo$address === void 0 ? void 0 : _hospInfo$address.latitude,
-                  "long": hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address2 = hospInfo.address) === null || _hospInfo$address2 === void 0 ? void 0 : _hospInfo$address2.longitude
+                  "long": hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address2 = hospInfo.address) === null || _hospInfo$address2 === void 0 ? void 0 : _hospInfo$address2.longitude,
+                  distance: distance
                 });
               }
             });
@@ -14154,19 +14391,19 @@ var GET_HOSPITALS_LOCALITY = createAsyncThunk("searhcApiSlice/getHospitals", /*#
             data: returnData
           }));
 
-        case 13:
-          _context4.prev = 13;
+        case 18:
+          _context4.prev = 18;
           _context4.t0 = _context4["catch"](2);
           return _context4.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context4.t0.message
           })));
 
-        case 16:
+        case 21:
         case "end":
           return _context4.stop();
       }
     }
-  }, _callee4, null, [[2, 13]]);
+  }, _callee4, null, [[2, 18]]);
 })));
 var GET_SYMPTOMS = createAsyncThunk("searhcApiSlice/getSymptoms", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
   var payload,
@@ -14552,26 +14789,82 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
     }
   }, _callee10, null, [[2, 12]]);
 })));
-var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practitionerAgainstOrganization", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+
+var getLocationInfo = /*#__PURE__*/function () {
+  var _ref21 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+    var _hospInfo$address3, _hospInfo$address3$, _hospInfo$address3$$c;
+
+    var hospInfo,
+        obj,
+        city,
+        info,
+        _args11 = arguments;
+    return regeneratorRuntime.wrap(function _callee11$(_context11) {
+      while (1) {
+        switch (_context11.prev = _context11.next) {
+          case 0:
+            hospInfo = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
+            obj = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : {};
+            city = hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address3 = hospInfo.address) === null || _hospInfo$address3 === void 0 ? void 0 : (_hospInfo$address3$ = _hospInfo$address3[0]) === null || _hospInfo$address3$ === void 0 ? void 0 : (_hospInfo$address3$$c = _hospInfo$address3$.city) === null || _hospInfo$address3$$c === void 0 ? void 0 : _hospInfo$address3$$c.geogLevelName;
+
+            if (obj[city]) {
+              _context11.next = 8;
+              break;
+            }
+
+            _context11.next = 6;
+            return getLatLong(city);
+
+          case 6:
+            info = _context11.sent;
+            obj[city] = info;
+
+          case 8:
+          case "end":
+            return _context11.stop();
+        }
+      }
+    }, _callee11);
+  }));
+
+  return function getLocationInfo() {
+    return _ref21.apply(this, arguments);
+  };
+}();
+
+var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practitionerAgainstOrganization", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
-      _ref22,
+      _ref23,
       rejectWithValue,
       _payload$practitioner,
       practitionerId,
+      _yield$getCurrentPosi2,
+      myLat,
+      myLong,
       body,
       data,
       returnData,
       _data$result,
-      _args11 = arguments;
+      _data$result2,
+      cityMap,
+      promArr,
+      _args12 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee11$(_context11) {
+  return regeneratorRuntime.wrap(function _callee12$(_context12) {
     while (1) {
-      switch (_context11.prev = _context11.next) {
+      switch (_context12.prev = _context12.next) {
         case 0:
-          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
-          _ref22 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref22.rejectWithValue;
-          _context11.prev = 2;
+          payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+          _ref23 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref23.rejectWithValue;
+          _context12.prev = 2;
           _payload$practitioner = payload.practitionerId, practitionerId = _payload$practitioner === void 0 ? "" : _payload$practitioner;
+          _context12.next = 6;
+          return getCurrentPosition();
+
+        case 6:
+          _yield$getCurrentPosi2 = _context12.sent;
+          myLat = _yield$getCurrentPosi2.lat;
+          myLong = _yield$getCurrentPosi2["long"];
           body = {
             db_name: dbName,
             entity: "Practitioner,Organization",
@@ -14579,45 +14872,72 @@ var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practit
               Practitioner: "Practitioner.id==".concat(practitionerId),
               Organization: "document(Practitioner.practitioner_role)[*].OrgID any == Organization._id"
             },
-            return_fields: "{OrganizationName:Organization.name, OrgID:Organization.id}"
+            return_fields: "{address: (let add = Document(Organization.address[0]) return merge(add, { city: Document(add.city) })), OrganizationName:Organization.name, OrgID:Organization.id}"
           };
-          _context11.next = 7;
+          _context12.next = 12;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
-        case 7:
-          data = _context11.sent;
+        case 12:
+          data = _context12.sent;
           returnData = [];
 
-          if (Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
-            data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.forEach(function (hospInfo) {
-              returnData.push({
-                value: hospInfo.OrgID,
-                label: hospInfo.OrganizationName,
-                lat: 0,
-                "long": 0
-              });
-            });
+          if (!Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
+            _context12.next = 20;
+            break;
           }
 
-          return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
+          cityMap = {};
+          promArr = data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (hospInfo) {
+            return getLocationInfo(hospInfo, cityMap);
+          });
+          _context12.next = 19;
+          return es6Promise.Promise.all(promArr);
+
+        case 19:
+          data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : _data$result2.forEach(function (hospInfo) {
+            var _hospInfo$address4, _hospInfo$address4$, _hospInfo$address4$$c;
+
+            var city = hospInfo === null || hospInfo === void 0 ? void 0 : (_hospInfo$address4 = hospInfo.address) === null || _hospInfo$address4 === void 0 ? void 0 : (_hospInfo$address4$ = _hospInfo$address4[0]) === null || _hospInfo$address4$ === void 0 ? void 0 : (_hospInfo$address4$$c = _hospInfo$address4$.city) === null || _hospInfo$address4$$c === void 0 ? void 0 : _hospInfo$address4$$c.geogLevelName;
+
+            var _ref24 = cityMap[city] || {},
+                lat = _ref24.lat,
+                _long2 = _ref24["long"];
+
+            var distance = "";
+
+            if (myLat && myLong && lat && _long2) {
+              distance = getDisctanceFromLatLonInKm(lat, _long2, myLat, myLong) + " KM";
+            }
+
+            returnData.push({
+              value: hospInfo.OrgID,
+              label: hospInfo.OrganizationName,
+              lat: 0,
+              "long": 0,
+              distance: distance
+            });
+          });
+
+        case 20:
+          return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
             data: returnData
           }));
 
-        case 13:
-          _context11.prev = 13;
-          _context11.t0 = _context11["catch"](2);
-          return _context11.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context11.t0.message
+        case 23:
+          _context12.prev = 23;
+          _context12.t0 = _context12["catch"](2);
+          return _context12.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context12.t0.message
           })));
 
-        case 16:
+        case 26:
         case "end":
-          return _context11.stop();
+          return _context12.stop();
       }
     }
-  }, _callee11, null, [[2, 13]]);
+  }, _callee12, null, [[2, 23]]);
 })));
 var searhcApiSlice = createSlice({
   name: "searhcApiSlice",
@@ -18302,7 +18622,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
-          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id &&  DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Checked-in'")
+          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
         return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       },
@@ -18311,7 +18631,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
-          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id &&  DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Checked-in'")
+          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage In-Progress'))")
         },
         return_fields: "{Appointment:merge(keep(Appointment,'_id','_key','id','alias','start','appno','appointmentReason','consultationMode','SpecialtyID'),{SpecialtyID:(for c in CodeableConceptMaster filter c.id in Appointment.SpecialtyID return merge(c,{coding:document(c.coding)}))}),Encounter:merge(keep(Encounter,'_id','_key','id','encounter_no','visit_type','status','patient_id','participant','encounterdate','participantHistory','practitioner_details','reasonCode','reasonReference'),{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for hn in HumanNameMaster filter hn._id in pat.name return merge(hn,{use:document(hn.use),prefix:document(hn.prefix),suffix:document(hn.suffix)})),telecom:document(pat.telecom),gender:document(pat.gender),MRN:pat.alias,age:pat.age,photo:document(pat.photo)})),status:document(Encounter.status)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for cdd in CodeableConceptMaster filter cdd._id == pd.speciality return merge(cdd,{coding: document(cdd.coding)}))}))},{participant:(for par in Encounter.participant return merge(par,{Practitioner_id:(for prac in Practitioner filter prac.id == par.Practitioner_id return merge(keep(prac,'_id','_key','id','name','practitioner_role','practitioner_type'),{name:(for hnm in HumanNameMaster filter hnm._id in prac.name return merge(hnm,{use:(for cod in CodeableConceptMaster filter cod._id==hnm.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id==hnm.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id==hnm.suffix return document(cod.coding))}))},{practitioner_type:(for cod in CodeableConceptMaster filter cod._id ==par.practitioner_type return document(cod.coding) )},{practitioner_role:(for prcrole in PractitionerRole filter prcrole._id in prac.practitioner_role return merge(prcrole,{role:(for cd in CodeableConceptMaster filter cd._id==prcrole.role return merge(cd,{coding: document(cd.coding)}))},{SpecialtyID:(for cdd in CodeableConceptMaster filter cdd._id == prcrole.SpecialtyID return merge(cdd, {coding:document(cdd.coding)}))}))}))},{type:document(par.type)},{PractitionerRole_id:(for prid in PractitionerRole filter prid.id==par.PractitionerRole_id return merge(prid,{role:document(prid.role)}))}))},{reasonReference:document(Encounter.reasonReference)},{participantHistory:(for phy in to_array (Encounter.participantHistory) return merge(phy,{specialty:(for spe in Specialty filter spe._id == phy.specialty return merge(spe,{facilities:document(spe.facilities)}))},{practitionerId:keep(document(phy.practitionerId),'_id','_key','id','name')},{practroleId:document(phy.practroleId)},{participantType:document(phy.participantType)}))})}"
       }
@@ -18561,7 +18881,7 @@ var highPriorityPatientQuery = {
       1: {
         db_name: "primarycare",
         entity: "Encounter",
-        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high'"),
+        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high' AND (lower(DOCUMENT(Encounter.status).display)==lower('Triaged') or lower(DOCUMENT(Encounter.status).display)==lower('In-progress'))"),
         return_fields: "MERGE(Encounter,{patient_id:(FOR pat IN Patient FILTER pat.id==Encounter.patient_id RETURN MERGE(pat,{name:(FOR hn IN TO_ARRAY(pat.name) RETURN DOCUMENT(hn)),photo:(FOR ph IN TO_ARRAY(pat.photo) RETURN DOCUMENT(ph))})),priority:DOCUMENT(Encounter.priority),priorityreason:DOCUMENT(Encounter.priorityreason)},{appointmentId:(for app in Appointment filter app.id in Encounter.appointmentId return app)},{reasonReference:document(Encounter.reasonReference)})"
       },
       2: {

package/package.json

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