primarycare-binder 1.1.108 → 1.1.111

package/dist/index.cjs.js

@@ -8180,7 +8180,8 @@ var queries$b = {
           thirdName = _ref2.thirdName;
       return "(LIKE(DOCUMENT(Person.name)[0].text,'%".concat(firstName, "%',true) ||  LIKE(DOCUMENT(Person.name)[0].given,'%").concat(secondName, "%',true) || LIKE(DOCUMENT(Person.name)[0].family,'%").concat(thirdName, "%',true)) && Person.activestatus == true");
     },
-    returnFields: "{prefix: DOCUMENT(Person.name)[*].prefix,gender: Person.gender,birthDate: Person.birthDay,suffix: DOCUMENT(Person.name)[*].suffix, nameObj: DOCUMENT(Person.name)[*], name: DOCUMENT(Person.name)[*].text, personId: Person.Id,patientDetail: (for pat in Patient FILTER pat.personID == Person.Id RETURN merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{photo:document(pat.photo)})),telecom: Document(Person.telecom),photo:document(Person.photo)}"
+    returnFields: // "{prefix: DOCUMENT(Person.name)[*].prefix,gender: Person.gender,birthDate: Person.birthDay,suffix: DOCUMENT(Person.name)[*].suffix, nameObj: DOCUMENT(Person.name)[*], name: DOCUMENT(Person.name)[*].text, personId: Person.Id,patientDetail: (for pat in Patient FILTER pat.personID == Person.Id RETURN merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{photo:document(pat.photo)})),telecom: Document(Person.telecom),photo:document(Person.photo)}",
+    "{prefix: document(DOCUMENT(Person.name)[*].prefix),gender: Person.gender,birthDate: Person.birthDay,suffix: document(DOCUMENT(Person.name)[*].suffix), nameObj:(for HumanNameMaster in HumanNameMaster filter HumanNameMaster._id in Person.name && HumanNameMaster.activestatus==true return merge(HumanNameMaster,{prefix:document(HumanNameMaster.prefix)},{suffix:document(HumanNameMaster.suffix)},{period:document(HumanNameMaster.period)},{use:document(HumanNameMaster.use)}) ) , name: DOCUMENT(Person.name)[*].text, personId: Person.Id,patientDetail: (for pat in Patient FILTER pat.personID == Person.Id RETURN merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),prefix:document(nam.prefix),suffix:document(nam.suffix)}))},{photo:document(pat.photo)})),telecom: Document(Person.telecom),photo:document(Person.photo)}"
   },
   specialityAgainstPractitioner: {
     query: function query() {
@@ -11847,13 +11848,35 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
             followUpAppointment: [],
             currentVisist: []
           };
+          console.clear();
           (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$past_appointm = _data$2.past_appointment) === null || _data$2$past_appointm === void 0 ? void 0 : (_data$2$past_appointm2 = _data$2$past_appointm.forEach) === null || _data$2$past_appointm2 === void 0 ? void 0 : _data$2$past_appointm2.call(_data$2$past_appointm, function (v) {
             if (assemble && moment$1(utcTOLocal$1(v === null || v === void 0 ? void 0 : v.start) * 1000).startOf("day").diff(moment$1().startOf("day"), "days") === 0 && (v.comment === "completed_assemble" || v.comment === "onhold_nurse" || v.comment === "completed_nurse" || v.comment === "onhold_doctor")) {
               returnData.currentVisist.push(v);
             } else {
-              var type_ = timeLine_(v.start); //debugger
+              console.log(utcTOLocal$1(v.start));
+              var type_ = timeLine_(v.start);
+              console.log("type_", type_); //debugger
 
-              if (type_ === "THIS_WEEK") {
+              if (type_ === "TODAY" && v.appstatus === "cancelled") {
+                returnData.pastAppointmentThisWeek.push(v);
+                returnData.pastAppointment.push(v);
+              } else if (type_ === "THIS_WEEK" && v.appstatus === "cancelled") {
+                returnData.pastAppointmentThisWeek.push(v);
+                returnData.pastAppointment.push(v);
+              } else if (type_ === "LAST_WEEK" && v.appstatus === "cancelled") {
+                returnData.pastAppointmentLastWeek.push(v);
+                returnData.pastAppointment.push(v);
+              } else if (type_ === "THIS_MONTH" && v.appstatus === "cancelled") {
+                returnData.pastAppointmentThisMonth.push(v);
+                returnData.pastAppointment.push(v);
+              } else if (type_ === "LAST_MONTH" && v.appstatus === "cancelled") {
+                returnData.pastAppointmentLastMonth.push(v);
+                returnData.pastAppointment.push(v);
+              } else if (type_ === "TODAY") {
+                returnData.currentVisist.push(v);
+              } else if (type_ === "NEXT_WEEK") {
+                returnData.currentVisist.push(v); // returnData.pastAppointment.push(v);
+              } else if (type_ === "THIS_WEEK") {
                 returnData.pastAppointmentThisWeek.push(v);
                 returnData.pastAppointment.push(v);
               } else if (type_ === "LAST_WEEK") {
@@ -11900,19 +11923,19 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
             data: returnData
           }));
 
-        case 14:
-          _context6.prev = 14;
+        case 15:
+          _context6.prev = 15;
           _context6.t0 = _context6["catch"](2);
           return _context6.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context6.t0.message
           })));
 
-        case 17:
+        case 18:
         case "end":
           return _context6.stop();
       }
     }
-  }, _callee6, null, [[2, 14]]);
+  }, _callee6, null, [[2, 15]]);
 }))); // end
 // GET__FOLLOW_UP_APPOINTMENT
 
@@ -18449,6 +18472,7 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
       rejectWithValue,
       payloaddata,
       enId,
+      encounterId,
       body,
       data,
       _args2 = arguments;
@@ -18461,7 +18485,7 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
           _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
           debugger;
           _context2.prev = 3;
-          payloaddata = payload.payloaddata, enId = payload.enId;
+          payloaddata = payload.payloaddata, enId = payload.enId, encounterId = payload.encounterId;
 
           if (enId) {
             body = [_objectSpread2({
@@ -18473,6 +18497,16 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
               },
               metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd"
             }, payloaddata)];
+          } else if (encounterId) {
+            body = [_objectSpread2({
+              db_name: dbName,
+              entity: "Encounter",
+              is_metadata: true,
+              filter: {
+                _key: "".concat(encounterId)
+              },
+              metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd"
+            }, payloaddata)];
           } else {
             body = [_objectSpread2({
               db_name: dbName,
@@ -31567,7 +31601,18 @@ var LabOrderApiSlice$1 = LabOrderApiSlice.reducer;
 
 var queries$5 = {
   drugType: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugType\",\n        \"return_fields\": \"DrugType\"\n    }"),
-  drugMaster: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"limit\":{\n          \"count\":100,\n          \"offset\":0\n          \n          },\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})\"\n    }"),
+  // drugMaster: `{
+  //       "db_name": "${dbName}",
+  //       "entity": "DrugMaster",
+  //       "limit":{
+  //         "count":100,
+  //         "offset":0
+  //         },
+  //       "return_fields": "MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})"
+  //   }`,
+  drugMaster: function drugMaster(input_text) {
+    return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"DrugMaster\",\n        \"filter\":\"(like(DrugMaster.ShortDesc,'%").concat(input_text, "%',true) || like(DrugMaster.LongDesc,'%").concat(input_text, "%',true) || like(DrugMaster.DrugCode,'%").concat(input_text, "%',true)) && DrugMaster.activestatus==true\",\n        \"limit\":{\n          \"count\":100,\n          \"offset\":0\n        },\n        \"return_fields\": \"MERGE(DrugMaster,{DrugType:DOCUMENT(DrugMaster.DrugType),FormCode:DOCUMENT(DrugMaster.FormCode)})\"\n    }");
+  },
   getMedications: function getMedications(id) {
     return "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"filter\": \"PH_OrderLine.patient_Id=='").concat(id, "'\",\n        \"entity\": \"PH_OrderLine\",\n        \"return_fields\": \"MERGE(PH_OrderLine, { patient_Id:(FOR pname IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).name) RETURN MERGE(DOCUMENT(PH_OrderLine.patient_Id), { name:DOCUMENT(pname), telecom:(FOR ptel IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).telecom) RETURN DOCUMENT(ptel)), martialStatus:(FOR mstatus IN TO_ARRAY(DOCUMENT(PH_OrderLine.patient_Id).martialStatus) RETURN DOCUMENT(mstatus)) } ) ) ,org_Id:MERGE(DOCUMENT(PH_OrderLine.org_Id), { telecom:(FOR otel IN TO_ARRAY(DOCUMENT(PH_OrderLine.org_Id).telecom) RETURN DOCUMENT(otel) ), address:(FOR oadd IN TO_ARRAY(DOCUMENT(PH_OrderLine.org_Id).address) RETURN DOCUMENT(oadd) ) }) ,encounter_Id:DOCUMENT(PH_OrderLine.encounter_Id) ,dosageDurationUOM:DOCUMENT(PH_OrderLine.dosageDurationUOM) ,dosageFreqCode:DOCUMENT(PH_OrderLine.dosageFreqCode) ,dosageUOM:DOCUMENT(PH_OrderLine.dosageUOM) ,drugCode:DOCUMENT(PH_OrderLine.drugCode) ,drugType:DOCUMENT(PH_OrderLine.drugType) , createdby:(FOR hn IN TO_ARRAY(DOCUMENT(PH_OrderLine.createdby).name) RETURN MERGE(DOCUMENT(PH_OrderLine.createdby),{name:DOCUMENT(hn)})) , updatedby:(FOR hn IN TO_ARRAY(DOCUMENT(PH_OrderLine.updatedby).name) RETURN MERGE(DOCUMENT(PH_OrderLine.updatedby),{name:DOCUMENT(hn)})) , statushistory:(FOR sth IN TO_ARRAY(PH_OrderLine.statushistory) RETURN MERGE(sth,{PersonID:(FOR hn IN TO_ARRAY(DOCUMENT(sth.PersonID).name) RETURN MERGE(DOCUMENT(sth.PersonID),{name:DOCUMENT(hn)}))})) } )\"\n    }");
   },
@@ -31718,6 +31763,7 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
   var payload,
       _ref4,
       rejectWithValue,
+      input_text,
       data,
       arr,
       _args2 = arguments;
@@ -31729,16 +31775,17 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
           payload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {};
           _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
           _context2.prev = 2;
-          _context2.next = 5;
+          input_text = payload.input_text;
+          _context2.next = 6;
           return fetchData$3({
-            body: queries$5.drugMaster
+            body: queries$5.drugMaster(input_text)
           }, __readDocumentUrl__);
 
-        case 5:
+        case 6:
           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, _val$DrugType3, _val$DrugType4, _val$drugroutegenid;
+            var _val$FormCode, _val$FormCode2, _val$StrengthValuesPo, _val$StrengthValuesPo2, _val$StrengthValuesPo3, _val$StrengthValuesPo4, _val$DrugType, _val$DrugType2, _val$DrugType3, _val$DrugType4, _val$drugroutegenid, _val$LongDesc;
 
             var json = {
               value: val === null || val === void 0 ? void 0 : val._id,
@@ -31751,12 +31798,15 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
               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,
-              drugroutegenid: (_val$drugroutegenid = val === null || val === void 0 ? void 0 : val.drugroutegenid) !== null && _val$drugroutegenid !== void 0 ? _val$drugroutegenid : "" // formValue
+              drugroutegenid: (_val$drugroutegenid = val === null || val === void 0 ? void 0 : val.drugroutegenid) !== null && _val$drugroutegenid !== void 0 ? _val$drugroutegenid : "",
+              LongDesc_: (_val$LongDesc = val === null || val === void 0 ? void 0 : val.LongDesc) !== null && _val$LongDesc !== void 0 ? _val$LongDesc : "",
+              DrugCode_: val === null || val === void 0 ? void 0 : val.DrugCode // formValue
 
             };
             arr.push(_objectSpread2(_objectSpread2({}, json), {}, {
-              name: val.ShortDesc,
-              label: val.ShortDesc // label: `${val.ShortDesc ?? ""} - ${json.StrengthValues} ${json.StrengthUOM}`,
+              name: val === null || val === void 0 ? void 0 : val.ShortDesc,
+              label: (val === null || val === void 0 ? void 0 : val.DrugCode) + " - " + (val === null || val === void 0 ? void 0 : val.ShortDesc) + " - " + (val === null || val === void 0 ? void 0 : val.LongDesc) // label: val?.ShortDesc
+              // label: `${val.ShortDesc ?? ""} - ${json.StrengthValues} ${json.StrengthUOM}`,
 
             }));
           });
@@ -31764,19 +31814,19 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
             data: arr
           }));
 
-        case 11:
-          _context2.prev = 11;
+        case 12:
+          _context2.prev = 12;
           _context2.t0 = _context2["catch"](2);
           return _context2.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context2.t0.message
           })));
 
-        case 14:
+        case 15:
         case "end":
           return _context2.stop();
       }
     }
-  }, _callee2, null, [[2, 11]]);
+  }, _callee2, null, [[2, 12]]);
 })));
 var STRENGTH_MASTER = createAsyncThunk("MedicationMastersSlice/strength_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
   var payload,

package/package.json

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