primarycare-binder 1.1.2 → 1.1.6

package/dist/index.cjs.js

@@ -11654,8 +11654,6 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           //NURSE - completed_nurse
           //DOCTOR - completed
 
-          debugger;
-
           if (status === "completed_assemble") {
             encounterStatus = "checked-in";
           } else if (status === "inprogress_nurse") {
@@ -11664,18 +11662,18 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           } else if (status === "completed_nurse") {
             encounterStatus = "Triaged";
           } else if (status === "doctor_inprogress") {
-            encounterStatus = "in-progress";
+            encounterStatus = "In-Progress";
             status = "completed_nurse";
           } else if (status === "completed") {
             encounterStatus = "consultation over";
           }
 
           if (!encounterStatus) {
-            _context14.next = 21;
+            _context14.next = 20;
             break;
           }
 
-          _context14.next = 9;
+          _context14.next = 8;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -11685,10 +11683,10 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
             })
           }, __readDocumentUrl__);
 
-        case 9:
+        case 8:
           encounterCode = _context14.sent;
           encounterStatus = (_encounterCode$result = encounterCode === null || encounterCode === void 0 ? void 0 : (_encounterCode$result2 = encounterCode.result) === null || _encounterCode$result2 === void 0 ? void 0 : (_encounterCode$result3 = _encounterCode$result2[0]) === null || _encounterCode$result3 === void 0 ? void 0 : _encounterCode$result3._id) !== null && _encounterCode$result !== void 0 ? _encounterCode$result : "";
-          _context14.next = 13;
+          _context14.next = 12;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -11698,12 +11696,12 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
             })
           }, __readDocumentUrl__);
 
-        case 13:
+        case 12:
           encounterInfo = _context14.sent;
           _ref30 = (encounterInfo === null || encounterInfo === void 0 ? void 0 : (_encounterInfo$result = encounterInfo.result) === null || _encounterInfo$result === void 0 ? void 0 : _encounterInfo$result[0]) || {}, _id = _ref30._id, _key = _ref30._key, statushistory = _ref30.statushistory;
 
           if (!(_id && _key && statushistory && Array.isArray(statushistory))) {
-            _context14.next = 21;
+            _context14.next = 20;
             break;
           }
 
@@ -11740,12 +11738,12 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               status: encounterStatus
             }
           }];
-          _context14.next = 21;
+          _context14.next = 20;
           return fetchData$3({
             body: JSON.stringify(updateData)
           }, __uspsertUrl__);
 
-        case 21:
+        case 20:
           // const appData = await fetchData({
           //   body: JSON.stringify(appBody),
           // });
@@ -11756,7 +11754,6 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }
 
           appInfo["comment"] = status;
-          debugger;
           body = [{
             db_name: dbName,
             entity: "Appointment",
@@ -11767,30 +11764,30 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               id: appointmentId
             }
           }];
-          _context14.next = 28;
+          _context14.next = 26;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
-        case 28:
+        case 26:
           data = _context14.sent;
           return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
-        case 32:
-          _context14.prev = 32;
+        case 30:
+          _context14.prev = 30;
           _context14.t0 = _context14["catch"](2);
           return _context14.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context14.t0.message
           })));
 
-        case 35:
+        case 33:
         case "end":
           return _context14.stop();
       }
     }
-  }, _callee14, null, [[2, 32]]);
+  }, _callee14, null, [[2, 30]]);
 })));
 var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApoointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
   var payload,
@@ -14506,9 +14503,8 @@ var SPECIALITY_AGAINST_PRACTITIONER = createAsyncThunk("searhcApiSlice/specialit
           _context10.prev = 2;
           body = {
             db_name: dbName,
-            entity: "Practitioner,PractitionerRole",
-            filter: queries$a["specialityAgainstPractitioner"].query(),
-            return_fields: queries$a["specialityAgainstPractitioner"].returnFields
+            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))})) })"
           };
           _context10.next = 6;
           return fetchData$3({
@@ -14521,13 +14517,13 @@ 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;
+              var _spec$name, _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,
                 value: spec.id,
                 type: 'Doctor',
-                speciality: spec === null || spec === void 0 ? void 0 : (_spec$SPECIALTY = spec.SPECIALTY) === null || _spec$SPECIALTY === void 0 ? void 0 : _spec$SPECIALTY.text
+                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
               });
             });
           }
@@ -14572,9 +14568,12 @@ var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practit
           _payload$practitioner = payload.practitionerId, practitionerId = _payload$practitioner === void 0 ? "" : _payload$practitioner;
           body = {
             db_name: dbName,
-            entity: "Practitioner,PractitionerRole,Organization",
-            filter: queries$a["practitionerAgainstOrganization"].query(practitionerId),
-            return_fields: queries$a["practitionerAgainstOrganization"].returnFields
+            entity: "Practitioner,Organization",
+            filter: {
+              Practitioner: "Practitioner.id==".concat(practitionerId),
+              Organization: "document(Practitioner.practitioner_role)[*].OrgID any == Organization._id"
+            },
+            return_fields: "{OrganizationName:Organization.name, OrgID:Organization.id}"
           };
           _context11.next = 7;
           return fetchData$3({
@@ -14589,7 +14588,7 @@ var PRACTITIONER_AGAINST_ORGANIZATION = createAsyncThunk("searhcApiSlice/practit
             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.Organization,
+                label: hospInfo.OrganizationName,
                 lat: 0,
                 "long": 0
               });
@@ -18015,15 +18014,15 @@ var dashboardQuery = {
       1: {
         db_name: "primarycare",
         entity: "Appointment",
-        filter: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, "  && Appointment.end<=").concat(endDate, " && lower(Appointment.appointmentType)!='cancelled' && Appointment.practitionerID any ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' collect with count into length"),
+        filter: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, "  && Appointment.end<=").concat(endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==").concat(loginId, " collect with count into length"),
         return_fields: "{Count:length}"
       },
       2: {
         db_name: "primarycare",
         entity: "Practitioner,Appointment",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && lower(Appointment.appointmentType)!='cancelled' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID collect with count into length")
+          Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID collect with count into length")
         },
         return_fields: "{Count:length}"
       },
@@ -18054,7 +18053,6 @@ var dashboardQuery = {
     };
   },
   todayVisit: function todayVisit(orgID, startDate, endDate, loginId) {
-    debugger;
     return {
       1: {
         db_name: dbName,
@@ -18069,8 +18067,8 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == '".concat(orgID, "' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'  collect with count into length")
+          Practitioner: "Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == '".concat(orgID, "' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'  collect with count into length")
         },
         return_fields: "{CheckedIn:length}"
       },
@@ -18089,8 +18087,8 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.practitioner_type=='CodingMaster/10628' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgID),
-          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && Encounter.status=='CodingMaster/12401' collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.status).code=='ENCSTATUS008' collect with count into length")
         },
         return_fields: "{CheckedIn:length}"
       } // 3: {},
@@ -18104,8 +18102,8 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "lower(document(Practitioner.practitioner_type).display)=='nurse' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgID),
-          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='triaged' collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].display ANY =='Triaged' collect with count into length")
         },
         return_fields: "{Triage:length}"
       } // 3: {},
@@ -18119,8 +18117,8 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.practitioner_type=='CodingMaster/10628' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgID),
-          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && Encounter.status=='CodingMaster/11596' collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.status).code=='ENCSTATUS005' collect with count into length")
         },
         return_fields: "{InProgress:length}"
       } // 3: {},
@@ -18134,47 +18132,19 @@ var dashboardQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "lower(document(Practitioner.practitioner_type).display)=='doctor' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgID),
-          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='finished' collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(loginId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Encounter: "DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=".concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{Finished:length}"
       } // 3: {},
 
     };
   },
-  // checkingAppointment: (orgID, startDate, endDate, loginId) => {
-  //   return {
-  //     1: {
-  //       db_name: dbName,
-  //       entity: "Practitioner,PractitionerRole,Appointment,Encounter",
-  //       filter: {
-  //         Practitioner: `Practitioner.id ==  ${loginId}`,
-  //         PractitionerRole: `PractitionerRole.id == Practitioner.PractitionerRoleID && PractitionerRole.OrgID[*] ANY == ${orgID}`,
-  //         Appointment: `Appointment.start >= ${startDate} && Appointment.end <= ${endDate}   && Appointment.SpecialtyID[*] ANY == PractitionerRole.SpecialtyID[0]`,
-  //         Encounter:
-  //           "Encounter.appointmentId[*] ANY == Appointment.id COLLECT WITH COUNT INTO length",
-  //       },
-  //       return_fields: "{'checkedInCount' : length}",
-  //     },
-  //     2: {
-  //       db_name: dbName,
-  //       entity: "Practitioner,PractitionerRole,Appointment,Encounter",
-  //       filter: `Practitioner.id == ${loginId} && PractitionerRole.id == Practitioner.PractitionerRoleID && PractitionerRole.OrgID[*] ANY == ${orgID} && Appointment.start >= ${startDate} && Appointment.end <= ${endDate} && Appointment.SpecialtyID[*] ANY == PractitionerRole.SpecialtyID[0] && Encounter.appointmentId[*] ANY == Appointment.id COLLECT WITH COUNT INTO length`,
-  //       return_fields: "{'checkedInCount' : length}",
-  //     },
-  //     3: {
-  //       db_name: dbName,
-  //       entity: "Practitioner,PractitionerRole,Appointment,Encounter",
-  //       filter: `Practitioner.id == ${loginId} && PractitionerRole._id == Practitioner.PractitionerRole && PractitionerRole.OrgID[*] ANY == ${orgID} && Appointment.start >= ${startDate} && Appointment.end <= ${endDate} && Appointment.SpecialtyID[*] ANY == PractitionerRole.SpecialtyID[0] && Encounter.appointmentId[*] ANY == Appointment.id COLLECT WITH COUNT INTO length`,
-  //       return_fields: "{'checkedInCount' : length}",
-  //     },
-  //   };
-  // },
   patientWaitingTimeQuery: function patientWaitingTimeQuery(orgID, loginId) {
     return {
       1: {
         db_name: dbName,
-        queryid: "4a129656-d8e2-4a3c-9626-7488903118f9",
+        queryid: "21fd3638-914e-41a8-b6e5-36459565595a",
         filter: {
           practid: loginId,
           orgid: "".concat(orgID)
@@ -18197,7 +18167,7 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Appointment,Encounter",
         filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && Appointment.practitionerID any ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
+          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')  collect with count into length"
         },
         return_fields: "{FirstVisitCount:length}"
@@ -18206,8 +18176,8 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Practitioner,Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID"),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')  collect with count into length"
         },
         return_fields: "{FirstVisitCount:length}"
@@ -18229,7 +18199,7 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Appointment,Encounter",
         filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, "  && Appointment.end<=").concat(endDate, " && Appointment.practitionerID any ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
+          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, "  && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')  collect with count into length"
         },
         return_fields: "{OtherVisitsCount:length}"
@@ -18238,8 +18208,8 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Practitioner,Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID"),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')  collect with count into length"
         },
         return_fields: "{OtherVisitsCount:length}"
@@ -18261,7 +18231,7 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Appointment,Encounter",
         filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && Appointment.practitionerID any ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
+          Appointment: "Appointment.activestatus==true && Appointment.start>= ".concat(startDate, " && Appointment.end<=").concat(endDate, " && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')  collect with count into length"
         },
         return_fields: "{WalkinCount:length}"
@@ -18270,8 +18240,8 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Practitioner,Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID"),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')  collect with count into length"
         },
         return_fields: "{WalkinCount:length}"
@@ -18293,7 +18263,7 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Appointment,Encounter",
         filter: {
-          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && Appointment.practitionerID any ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
+          Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(startDate, "  && Appointment.end<=").concat(endDate, "  && document(Appointment.resourcecode).id ==").concat(loginId, " && Appointment.orgid=='").concat(orgID, "' "),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')  collect with count into length"
         },
         return_fields: "{NewPatientCount:length}"
@@ -18302,8 +18272,8 @@ var dashboardQuery = {
         db_name: "primarycare",
         entity: "Practitioner,Appointment,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
-          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID"),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgID, "'"),
+          Appointment: "Appointment.activestatus==true && Appointment.orgid=='".concat(orgID, "' && Appointment.start>=").concat(startDate, " && Appointment.end<=").concat(endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID"),
           Encounter: "Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')  collect with count into length"
         },
         return_fields: "{NewPatientCount:length}"
@@ -18326,7 +18296,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
-          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && lower(document(Encounter.status).display) like 'checked-in'")
+          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='checked-in'")
         },
         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)}))})}"
       },
@@ -18335,7 +18305,7 @@ var dashboardQuery = {
         entity: "Appointment,Encounter",
         filter: {
           Appointment: "Appointment.activestatus==true && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end),
-          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && lower(document(Encounter.status).display) like 'checked-in'")
+          Encounter: "Encounter._key=='".concat(encounterKey, "' && Encounter.activestatus==true && Encounter.appointmentId[*] any == Appointment.id && lower(first(document(Encounter.statushistory[*].status)[*].display)) =='checked-in'")
         },
         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)}))})}"
       }
@@ -18451,14 +18421,13 @@ var dashboardQuery = {
   }
 };
 var visitQuery = {
-  checkedIn: function checkedIn(startDate, endDate, orgId, loginId) {
-    debugger;
+  checkedIn: function checkedIn(startDate, endDate, orgId, loginId, orGId) {
     return {
       1: {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgId),
+          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
           Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in' collect with count into length")
         },
         return_fields: "{CheckedIn:length}"
@@ -18467,8 +18436,8 @@ var visitQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgId),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'  collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " &&  DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " &&  lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'  collect with count into length")
         },
         return_fields: "{CheckedIn:length}"
       },
@@ -18480,13 +18449,13 @@ var visitQuery = {
       }
     };
   },
-  traigeDone: function traigeDone(startDate, endDate, orgId, loginId) {
+  traigeDone: function traigeDone(startDate, endDate, orgId, loginId, orGId) {
     return {
       1: {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgId),
+          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
           Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>=").concat(startDate, "  && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Triaged' collect with count into length")
         },
         return_fields: "{TriagedCount:length}"
@@ -18495,7 +18464,7 @@ var visitQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==".concat(loginId, "  && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgId),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==".concat(loginId, "  && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
           Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Triaged' collect with count into length")
         },
         return_fields: "{TriagedCount:length}"
@@ -18508,14 +18477,14 @@ var visitQuery = {
       }
     };
   },
-  visitCompleted: function visitCompleted(startDate, endDate, orgId, loginId) {
+  visitCompleted: function visitCompleted(startDate, endDate, orgId, loginId, orGId) {
     return {
       1: {
         db_name: "primarycare",
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY ==").concat(orgId),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id ==".concat(orgId, "  && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY =='Consultation over' collect with count into length")
+          Practitioner: "Practitioner.activestatus==true && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id ==".concat(orgId, "  && Encounter.participant[*].Practitioner_id any == Practitioner.id && Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{CompletedCount:length}"
       },
@@ -18523,15 +18492,15 @@ var visitQuery = {
         db_name: dbName,
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orgId, "'"),
-          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<= ").concat(endDate, " && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Consultation over' collect with count into length")
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id== ".concat(loginId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(orGId, "'"),
+          Encounter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Encounter.practitioner_details[*].speciality AND Encounter.encounterdate>= ").concat(startDate, " && Encounter.encounterdate<= ").concat(endDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length")
         },
         return_fields: "{CompletedCount:length}"
       },
       3: {
         db_name: dbName,
         entity: "Encounter",
-        filter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && DOCUMENT(Encounter.statushistory[*].status)[*].display ANY=='Consultation over' collect with count into length"),
+        filter: "Encounter.activestatus == true && Encounter.Organization_id == ".concat(orgId, " && Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " && document(Encounter.statushistory[*].status)[*].code ANY =='ENCSTATUS0010' collect with count into length"),
         return_fields: "{CompletedCount:length}"
       }
     };
@@ -18586,14 +18555,14 @@ 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' 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))})),participant:(FOR pract IN TO_ARRAY(Encounter.participant) RETURN MERGE(pract,{Practitioner_id:(FOR prac IN Practitioner FILTER prac.id==pract.Practitioner_id RETURN MERGE(prac,{name:(FOR hn IN TO_ARRAY(prac.name) RETURN DOCUMENT(hn))}))})) ,priority:DOCUMENT(Encounter.priority),priorityreason:DOCUMENT(Encounter.priorityreason)})"
+        filter: "Encounter.participant[*].Practitioner_id ANY ==".concat(practionerId, " AND Encounter.encounterdate>=").concat(startDate, " && Encounter.encounterdate<=").concat(endDate, " AND lower(DOCUMENT(Encounter.priority).display)=='high'"),
+        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: {
         db_name: "primarycare",
         entity: "Practitioner,Encounter",
         filter: {
-          Practitioner: "lower(document(Practitioner.practitioner_type).display)=='nurse' and Practitioner.id==".concat(practionerId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(org_id, "'"),
+          Practitioner: "DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' and Practitioner.id==".concat(practionerId, " AND DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(org_id, "'"),
           Encounter: "Encounter.encounterdate>=".concat(startDate, "  && Encounter.encounterdate<=").concat(endDate, " AND DOCUMENT(Encounter.priority).display=='High' AND (lower(DOCUMENT(Encounter.status).display)==lower('Checked-in') or lower(DOCUMENT(Encounter.status).display)==lower('Triage 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)})"
@@ -18643,7 +18612,7 @@ var APPOINTMENTS = createAsyncThunk("dashboardApiSlice/runquery", /*#__PURE__*/_
           data = _context.sent;
           _context.next = 9;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orGId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orGId, loginId, orgId)[roleId])
           }, __readDocumentUrl__);
 
         case 9:
@@ -18718,11 +18687,11 @@ var TODAY_SCHEDULE = createAsyncThunk("dashboardApiSlice/today_schedul", /*#__PU
               var _val$slot;
 
               (_val$slot = val.slot) === null || _val$slot === void 0 ? void 0 : _val$slot.map(function (task) {
-                var _task$Appointment$0$D, _task$Appointment, _task$Appointment$, _task$status, _task$start, _task$end, _task$Type;
+                var _task$Appointment$0$c, _task$Appointment, _task$Appointment$, _task$start, _task$end, _task$Type;
 
                 return arr.push({
-                  title: (_task$Appointment$0$D = task === null || task === void 0 ? void 0 : (_task$Appointment = task.Appointment) === null || _task$Appointment === void 0 ? void 0 : (_task$Appointment$ = _task$Appointment[0]) === null || _task$Appointment$ === void 0 ? void 0 : _task$Appointment$.Description) !== null && _task$Appointment$0$D !== void 0 ? _task$Appointment$0$D : "",
-                  status: ((_task$status = task === null || task === void 0 ? void 0 : task.status) !== null && _task$status !== void 0 ? _task$status : (task === null || task === void 0 ? void 0 : task.status) === "available" && (task === null || task === void 0 ? void 0 : task.Appointment.length) > 0) ? true : false,
+                  title: (_task$Appointment$0$c = task === null || task === void 0 ? void 0 : (_task$Appointment = task.Appointment) === null || _task$Appointment === void 0 ? void 0 : (_task$Appointment$ = _task$Appointment[0]) === null || _task$Appointment$ === void 0 ? void 0 : _task$Appointment$.consultationMode) !== null && _task$Appointment$0$c !== void 0 ? _task$Appointment$0$c : "",
+                  status: (task === null || task === void 0 ? void 0 : task.Appointment.length) > 0 ? false : true,
                   timefrom: (_task$start = task === null || task === void 0 ? void 0 : task.start) !== null && _task$start !== void 0 ? _task$start : "",
                   timeto: (_task$end = task === null || task === void 0 ? void 0 : task.end) !== null && _task$end !== void 0 ? _task$end : "",
                   type: (_task$Type = task === null || task === void 0 ? void 0 : task.Type) !== null && _task$Type !== void 0 ? _task$Type : ""
@@ -19076,34 +19045,32 @@ var TODAY_VISIT = createAsyncThunk("dashboardApiSlice/today_visit", /*#__PURE__*
           _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue;
           _context9.prev = 2;
           orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, orgIdInt = payload.orgIdInt;
-          debugger;
-          _context9.next = 7;
+          _context9.next = 6;
           return fetchData$3({
             body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgIdInt, loginId)[roleId])
           }, __readDocumentUrl__);
 
-        case 7:
+        case 6:
           data = _context9.sent;
-          debugger;
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: {
               count: (_data$result$0$Checke2 = data === null || data === void 0 ? void 0 : (_data$result2 = data.result) === null || _data$result2 === void 0 ? void 0 : (_data$result2$ = _data$result2[0]) === null || _data$result2$ === void 0 ? void 0 : _data$result2$.CheckedIn) !== null && _data$result$0$Checke2 !== void 0 ? _data$result$0$Checke2 : 0
             }
           }));
 
-        case 12:
-          _context9.prev = 12;
+        case 10:
+          _context9.prev = 10;
           _context9.t0 = _context9["catch"](2);
           return _context9.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context9.t0.message
           })));
 
-        case 15:
+        case 13:
         case "end":
           return _context9.stop();
       }
     }
-  }, _callee9, null, [[2, 12]]);
+  }, _callee9, null, [[2, 10]]);
 })));
 var OTHER_VISIT_COUNT = createAsyncThunk("dashboardApiSlice/runquery", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
   var payload,
@@ -20634,6 +20601,7 @@ var VISIT_CHECKEDIN = createAsyncThunk("visitStatsApiSlice/visitCheckedin", /*#_
       endDate,
       roleId,
       loginId,
+      org_id,
       data,
       _args = arguments;
 
@@ -20644,10 +20612,10 @@ var VISIT_CHECKEDIN = createAsyncThunk("visitStatsApiSlice/visitCheckedin", /*#_
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId;
+          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, roleId = payload.roleId, loginId = payload.loginId, org_id = payload.org_id;
           _context.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgId, loginId, org_id)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
@@ -20842,6 +20810,7 @@ var GET_VISIT_STATS = createAsyncThunk("visitStatsApiSlice/visitStatsCount", /*#
       endDate,
       loginId,
       roleId,
+      org_id,
       data,
       data1,
       data2,
@@ -20855,31 +20824,31 @@ var GET_VISIT_STATS = createAsyncThunk("visitStatsApiSlice/visitStatsCount", /*#
           payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
           _ref10 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
           _context5.prev = 2;
-          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, loginId = payload.loginId, roleId = payload.roleId;
+          orgId = payload.orgId, startDate = payload.startDate, endDate = payload.endDate, loginId = payload.loginId, roleId = payload.roleId, org_id = payload.org_id;
           _context5.next = 6;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.checkedIn(startDate, endDate, orgId, loginId, org_id)[roleId])
           }, __readDocumentUrl__);
 
         case 6:
           data = _context5.sent;
           _context5.next = 9;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.traigeDone(startDate, endDate, orgId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.traigeDone(startDate, endDate, orgId, loginId, org_id)[roleId])
           }, __readDocumentUrl__);
 
         case 9:
           data1 = _context5.sent;
           _context5.next = 12;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.visitCompleted(startDate, endDate, orgId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.visitCompleted(startDate, endDate, orgId, loginId, org_id)[roleId])
           }, __readDocumentUrl__);
 
         case 12:
           data2 = _context5.sent;
           _context5.next = 15;
           return fetchData$3({
-            body: JSON.stringify(visitQuery.noShows(startDate, endDate, orgId, loginId)[roleId])
+            body: JSON.stringify(visitQuery.noShows(startDate, endDate, orgId, loginId, org_id)[roleId])
           }, __readDocumentUrl__);
 
         case 15:
@@ -26010,7 +25979,7 @@ var queries$6 = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})" // db_name: `${dbName}`,
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})" // db_name: `${dbName}`,
       // entity: "CA_OrderLine",
       // filter: `CA_OrderLine.encounter_Id=="${encounter_id}" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=="${order_id}" && CA_OrderLine.activestatus==true`,
       // filter: `CA_OrderLine.encounter_Id=="${encounter_id}" && CA_OrderLine.Oltype=='LAB' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true`,
@@ -28746,7 +28715,7 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
           data = _context2.sent;
           arr = [];
           data.result.map(function (val) {
-            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2;
+            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2, _val$DrugType3, _val$DrugType4;
 
             var json = {
               value: val === null || val === void 0 ? void 0 : val._id,
@@ -28756,7 +28725,9 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
               StrengthValues: val === null || val === void 0 ? void 0 : (_val$StrengthValuesPo = val.StrengthValuesPossible) === null || _val$StrengthValuesPo === void 0 ? void 0 : (_val$StrengthValuesPo2 = _val$StrengthValuesPo[0]) === null || _val$StrengthValuesPo2 === void 0 ? void 0 : _val$StrengthValuesPo2.StrengthValue,
               StrengthUOM: val === null || val === void 0 ? void 0 : (_val$StrengthValuesPo3 = val.StrengthValuesPossible) === null || _val$StrengthValuesPo3 === void 0 ? void 0 : (_val$StrengthValuesPo4 = _val$StrengthValuesPo3[0]) === null || _val$StrengthValuesPo4 === void 0 ? void 0 : _val$StrengthValuesPo4.StrengthUOM,
               drugType: val === null || val === void 0 ? void 0 : (_val$DrugType = val.DrugType) === null || _val$DrugType === void 0 ? void 0 : _val$DrugType.drugtype,
-              drugTypeId: val === null || val === void 0 ? void 0 : (_val$DrugType2 = val.DrugType) === null || _val$DrugType2 === void 0 ? void 0 : _val$DrugType2._id // formValue
+              drugTypeLong: val === null || val === void 0 ? void 0 : (_val$DrugType2 = val.DrugType) === null || _val$DrugType2 === void 0 ? void 0 : _val$DrugType2.longdesc,
+              drugTypeShort: val === null || val === void 0 ? void 0 : (_val$DrugType3 = val.DrugType) === null || _val$DrugType3 === void 0 ? void 0 : _val$DrugType3.shortdesc,
+              drugTypeId: val === null || val === void 0 ? void 0 : (_val$DrugType4 = val.DrugType) === null || _val$DrugType4 === void 0 ? void 0 : _val$DrugType4._id // formValue
 
             };
             arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
@@ -30962,7 +30933,7 @@ var queries$4 = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='TREAT' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:document(req.organization),practId:(for prac in Practitioner filter prac._id==req.practId return merge({id: prac._id, 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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))})),practRole:document(req.practRole)}))})"
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -32874,7 +32845,7 @@ var queries$3 = (_queries = {
       db_name: "primarycare",
       entity: "CA_OrderLine",
       filter: "CA_OrderLine.encounter_Id==\"".concat(encounter_id, "\" && CA_OrderLine.Oltype=='RAD' && CA_OrderLine.parentOrderId=='' && CA_OrderLine.activestatus==true"),
-      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN DOCUMENT(doc._from)),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:document(req.organization),practId:(for prac in Practitioner filter prac._id==req.practId return merge({id: prac._id, 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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))})),practRole:document(req.practRole)}))})"
+      return_fields: "MERGE(CA_OrderLine,{childRecurrent:(for doc in CA_OrderLine_CA_OrderLine_E filter doc._to == CA_OrderLine._id RETURN MERGE(DOCUMENT(doc._from),{Requestor:(for req in TO_ARRAY(DOCUMENT(doc._from).Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})),org_Id:DOCUMENT(CA_OrderLine.org_Id),Requestor:(for req in TO_ARRAY(CA_OrderLine.Requestor) return merge(req,{organization:(document(req.organization)),practId:(for prac in Practitioner filter prac._id==req.practId return {id:prac._id,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)[*].display),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)[*].display),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding)[*].display)}))}),practRole:document(req.practRole)}))})"
     };
   },
   treatment_delete: function treatment_delete(id) {
@@ -37276,41 +37247,41 @@ var query$4 = {
   },
   // NURSE
   getAppointmentsNurse: function getAppointmentsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\"\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\"\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
   },
   getFirstVisitsNurse: function getFirstVisitsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
   },
   getNewPatientsNurse: function getNewPatientsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\": {\n             \n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
   },
   getOtherVisitsNurse: function getOtherVisitsNurse(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
+    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n          ");
   },
   getTodayVisitsNurse: function getTodayVisitsNurse(data) {
-    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Practitioner,Encounter\",\n          \"filter\": {\n            \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n            \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\",\n            \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n          },\n          \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
+    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Practitioner,Encounter\",\n          \"filter\": {\n            \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n            \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n            \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n          },\n          \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
   },
   getWalkInsNurse: function getWalkInsNurse(data) {
-    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true && lower(document(Practitioner.practitioner_type).display)=='nurse' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Practitioner,Appointment,Encounter\",\n            \"filter\": {\n              \"Practitioner\": \"Practitioner.activestatus==true &&  DOCUMENT(DOCUMENT(DOCUMENT(Practitioner.practitioner_role[*])[*].role)[0].coding)[*].code ANY =='PR023' && Practitioner.id==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && DOCUMENT(Practitioner.practitioner_role[*])[*].OrgID ANY =='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(DOCUMENT(Practitioner.practitioner_role[*])[*].SpecialtyID)[*].id ANY IN Appointment.SpecialtyID\",\n               \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   },
   //Doctor
   getAppointmentsDoctor: function getAppointmentsDoctor(data) {
-    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Appointment\",\n          \"filter\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
+    return "\n        {\n          \"db_name\": \"".concat(dbName, "\",\n          \"entity\": \"Appointment\",\n          \"filter\": \"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && lower(Appointment.appointmentType)!='cancelled' && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n          \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n        }\n        ");
   },
   getFirstVisitsDoctor: function getFirstVisitsDoctor(data) {
-    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n          {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('First Visit')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   },
   getNewPatientsDoctor: function getNewPatientsDoctor(data) {
-    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n         {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('New Patient')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   },
   getOtherVisitsDoctor: function getOtherVisitsDoctor(data) {
-    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Other Visits')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   },
   getTodayVisitsDoctor: function getTodayVisitsDoctor(data) {
-    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\": {\n             \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, "\",\n              \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n       {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\": {\n             \"Appointment\": \"Appointment.activestatus==true && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "' && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, " && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, "\",\n              \"Encounter\": \"Appointment.id in Encounter.appointmentId && lower(first(document(Encounter.statushistory[*].status)[*].display))=='checked-in'\",\n            },\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in document(Appointment.practitionerID) return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   },
   getWalkInsDoctor: function getWalkInsDoctor(data) {
-    return "\n        {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && Appointment.practitionerID any ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
+    return "\n        {\n            \"db_name\": \"".concat(dbName, "\",\n            \"entity\": \"Appointment,Encounter\",\n            \"filter\":{\n              \"Appointment\":\"Appointment.activestatus==true && Appointment.start>=").concat(data === null || data === void 0 ? void 0 : data.startDate, " && Appointment.end<=").concat(data === null || data === void 0 ? void 0 : data.endDate, "  && document(Appointment.resourcecode).id ==").concat(data === null || data === void 0 ? void 0 : data.practionerID, " && Appointment.orgid=='").concat(data === null || data === void 0 ? void 0 : data.orgID, "'\",\n              \"Encounter\":\"Appointment.id in Encounter.appointmentId && lower(Encounter.visit_type)==lower('Walkin')\"\n            }\n            \"return_fields\": \"merge(Appointment,{PersonID:(for per in Person filter per.Id in Appointment.PersonID return merge(per,{name:(for nam in HumanNameMaster filter nam._id in per.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(per.gender)})),practitionerID:(for prac in Practitioner filter prac.id in Appointment.practitionerID return merge(prac,{name:(for nam in HumanNameMaster filter nam._id in prac.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{gender:document(prac.gender)}))})\"\n          }\n        ");
   }
 };
 

package/package.json

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