primarycare-binder 1.1.107 → 1.1.110

package/dist/index.cjs.js

@@ -8174,10 +8174,14 @@ var queries$b = {
     returnFields: "{AppointmentID:Appointment.id,_id:Appointment._id,status:Appointment.status,appStatus:first(for en in Encounter filter Appointment.id in en.appointmentId return document(en.status)),avc:Appointment.avc,appnumber:Appointment.appno,end:Appointment.end,start:Appointment.start,createddate:Appointment.createddate,updatedate:Appointment.updatedate, personId:Appointment.PersonID, patient:(FOR adqolcPatient IN Patient FILTER adqolcPatient.personID IN Appointment.PersonID RETURN merge(adqolcPatient,{identifier:document(adqolcPatient.identifier)},{martialStatus:document(adqolcPatient.martialStatus)},{name:document(adqolcPatient.name)},{telecom:document(adqolcPatient.telecom)},{photo:document(adqolcPatient.photo)},{personID:(for pid in Person filter pid.Id == adqolcPatient.personID return pid)},{address:document(adqolcPatient.address)},{activereason:(DOCUMENT(adqolcPatient.activereason)),deceasedreason:(DOCUMENT(adqolcPatient.deceasedreason))},{isdeceased:(for doc in CodeableConceptMaster filter doc._id==adqolcPatient.isdeceased return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod)}))})) ,Person:MERGE(Person,{name:(FOR hn IN TO_ARRAY(Person.name) RETURN DOCUMENT(hn)),telecom:(FOR tel IN TO_ARRAY(Person.telecom) RETURN DOCUMENT(tel) ),photo:document(Person.photo)})}"
   },
   codablemasterGetPatientname: {
-    query: function query(patientName) {
-      return "(LIKE(DOCUMENT(Person.name)[0].text,'%".concat(patientName, "%',true) ||  LIKE(DOCUMENT(Person.name)[0].given,'%").concat(patientName, "%',true) || LIKE(DOCUMENT(Person.name)[0].family,'%").concat(patientName, "%',true)) && Person.activestatus == true");
+    query: function query(_ref2) {
+      var firstName = _ref2.firstName,
+          secondName = _ref2.secondName,
+          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() {
@@ -8192,9 +8196,9 @@ var queries$b = {
     },
     returnFields: "DISTINCT {Organization:Organization.name, OrgID:Organization.id}"
   },
-  getCodableConceptMaster: function getCodableConceptMaster(_ref2) {
-    var _ref2$type = _ref2.type,
-        type = _ref2$type === void 0 ? "" : _ref2$type;
+  getCodableConceptMaster: function getCodableConceptMaster(_ref3) {
+    var _ref3$type = _ref3.type,
+        type = _ref3$type === void 0 ? "" : _ref3$type;
     return {
       db_name: dbName,
       entity: "CodeableConceptMaster",
@@ -8243,9 +8247,9 @@ var queries$b = {
       sort: "OrderType.shortdesc asc"
     };
   },
-  getCaOrderLine: function getCaOrderLine(_ref3) {
-    var _ref3$id = _ref3.id,
-        id = _ref3$id === void 0 ? 0 : _ref3$id;
+  getCaOrderLine: function getCaOrderLine(_ref4) {
+    var _ref4$id = _ref4.id,
+        id = _ref4$id === void 0 ? 0 : _ref4$id;
     return {
       db_name: dbName,
       entity: "CA_OrderLine",
@@ -8253,9 +8257,9 @@ var queries$b = {
       return_fields: "CA_OrderLine"
     };
   },
-  getOrganization: function getOrganization(_ref4) {
-    var _ref4$id = _ref4.id,
-        id = _ref4$id === void 0 ? 0 : _ref4$id;
+  getOrganization: function getOrganization(_ref5) {
+    var _ref5$id = _ref5.id,
+        id = _ref5$id === void 0 ? 0 : _ref5$id;
     return {
       db_name: dbName,
       entity: "Organization",
@@ -8263,9 +8267,9 @@ var queries$b = {
       return_fields: "{_id:Organization._id,OrgID:Organization.id,name:Organization.name}"
     };
   },
-  getPractionerRole: function getPractionerRole(_ref5) {
-    var _ref5$id = _ref5.id,
-        id = _ref5$id === void 0 ? 0 : _ref5$id;
+  getPractionerRole: function getPractionerRole(_ref6) {
+    var _ref6$id = _ref6.id,
+        id = _ref6$id === void 0 ? 0 : _ref6$id;
     return {
       db_name: dbName,
       entity: "PractitionerRole,Organization,Practitioner",
@@ -8276,9 +8280,9 @@ var queries$b = {
       return_fields: "DISTINCT  MERGE({PractitionerRole:DOCUMENT(PractitionerRole.code)})"
     };
   },
-  getPractionerName: function getPractionerName(_ref6) {
-    var _ref6$id = _ref6.id,
-        id = _ref6$id === void 0 ? 0 : _ref6$id;
+  getPractionerName: function getPractionerName(_ref7) {
+    var _ref7$id = _ref7.id,
+        id = _ref7$id === void 0 ? 0 : _ref7$id;
     return {
       db_name: dbName,
       entity: "PractitionerRole,Organization,Practitioner",
@@ -8289,9 +8293,9 @@ var queries$b = {
       return_fields: "DISTINCT  MERGE({PractitionerName:DOCUMENT(Practitioner.name)})"
     };
   },
-  getCaDiagnosis: function getCaDiagnosis(_ref7) {
-    var _ref7$id = _ref7.id,
-        id = _ref7$id === void 0 ? 0 : _ref7$id;
+  getCaDiagnosis: function getCaDiagnosis(_ref8) {
+    var _ref8$id = _ref8.id,
+        id = _ref8$id === void 0 ? 0 : _ref8$id;
     return {
       db_name: dbName,
       entity: "CA_Diagnosis",
@@ -8299,9 +8303,9 @@ var queries$b = {
       return_fields: "DOCUMENT(CA_Diagnosis.diagcode)"
     };
   },
-  upsertCaOrderline: function upsertCaOrderline(_ref8) {
-    var _ref8$doc = _ref8.doc,
-        doc = _ref8$doc === void 0 ? {} : _ref8$doc;
+  upsertCaOrderline: function upsertCaOrderline(_ref9) {
+    var _ref9$doc = _ref9.doc,
+        doc = _ref9$doc === void 0 ? {} : _ref9$doc;
     return [{
       db_name: dbName,
       entity: "CA_OrderLine",
@@ -8310,9 +8314,9 @@ var queries$b = {
       doc: _objectSpread2({}, doc)
     }];
   },
-  upsertCaOrderApprovalWorkqueue: function upsertCaOrderApprovalWorkqueue(_ref9) {
-    var _ref9$doc = _ref9.doc,
-        doc = _ref9$doc === void 0 ? {} : _ref9$doc;
+  upsertCaOrderApprovalWorkqueue: function upsertCaOrderApprovalWorkqueue(_ref10) {
+    var _ref10$doc = _ref10.doc,
+        doc = _ref10$doc === void 0 ? {} : _ref10$doc;
     return [{
       db_name: dbName,
       entity: "CA_OrderApprovalWorkqueue",
@@ -8321,11 +8325,11 @@ var queries$b = {
       doc: _objectSpread2({}, doc)
     }];
   },
-  commonUpsertQuery: function commonUpsertQuery(_ref10) {
-    var _ref10$doc = _ref10.doc,
-        doc = _ref10$doc === void 0 ? {} : _ref10$doc,
-        _ref10$entity = _ref10.entity,
-        entity = _ref10$entity === void 0 ? "" : _ref10$entity;
+  commonUpsertQuery: function commonUpsertQuery(_ref11) {
+    var _ref11$doc = _ref11.doc,
+        doc = _ref11$doc === void 0 ? {} : _ref11$doc,
+        _ref11$entity = _ref11.entity,
+        entity = _ref11$entity === void 0 ? "" : _ref11$entity;
     return [{
       db_name: dbName,
       entity: entity,
@@ -11844,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") {
@@ -11897,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
 
@@ -19296,8 +19322,14 @@ var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
   var payload,
       _ref32,
       rejectWithValue,
+      _patientName$split,
+      _patientName$split2,
+      _patientName$split3,
       _payload$patientName,
       patientName,
+      firstName,
+      secondName,
+      thirdName,
       body,
       data,
       returnData,
@@ -19311,18 +19343,26 @@ var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
           _ref32 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref32.rejectWithValue;
           _context16.prev = 2;
           _payload$patientName = payload.patientName, patientName = _payload$patientName === void 0 ? "" : _payload$patientName;
+          firstName = (_patientName$split = patientName === null || patientName === void 0 ? void 0 : patientName.split(" ", 1)) !== null && _patientName$split !== void 0 ? _patientName$split : "";
+          secondName = (_patientName$split2 = patientName === null || patientName === void 0 ? void 0 : patientName.split(" ", 2)) !== null && _patientName$split2 !== void 0 ? _patientName$split2 : "";
+          thirdName = (_patientName$split3 = patientName === null || patientName === void 0 ? void 0 : patientName.split(" ", 3)) !== null && _patientName$split3 !== void 0 ? _patientName$split3 : "";
+          debugger;
           body = {
             db_name: dbName,
             entity: "Person",
-            filter: queries$b["codablemasterGetPatientname"].query(patientName),
+            filter: queries$b["codablemasterGetPatientname"].query({
+              firstName: firstName,
+              secondName: secondName,
+              thirdName: thirdName
+            }),
             return_fields: queries$b["codablemasterGetPatientname"].returnFields
           };
-          _context16.next = 7;
+          _context16.next = 11;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
-        case 7:
+        case 11:
           data = _context16.sent;
           returnData = [];
 
@@ -19334,19 +19374,19 @@ var GET_PATIENT_NAME = createAsyncThunk("OrganizationRegisterPatientApiSlice/get
             data: returnData
           }));
 
-        case 13:
-          _context16.prev = 13;
+        case 17:
+          _context16.prev = 17;
           _context16.t0 = _context16["catch"](2);
           return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context16.t0.message
           })));
 
-        case 16:
+        case 20:
         case "end":
           return _context16.stop();
       }
     }
-  }, _callee16, null, [[2, 13]]);
+  }, _callee16, null, [[2, 17]]);
 })));
 var GET_PATIENT_TYPEID = createAsyncThunk("OrganizationRegisterPatientApiSlice/getpatienttypeid", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
   var payload,
@@ -31550,7 +31590,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    }");
   },
@@ -31701,6 +31752,7 @@ var DRUGMASTER_MASTER = createAsyncThunk("MedicationMastersSlice/drugMaster_mast
   var payload,
       _ref4,
       rejectWithValue,
+      input_text,
       data,
       arr,
       _args2 = arguments;
@@ -31712,12 +31764,13 @@ 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) {
@@ -31747,19 +31800,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.107",
+  "version": "1.1.110",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",