primarycare-binder 1.1.86 → 1.1.89

package/dist/index.cjs.js

@@ -8063,11 +8063,17 @@ var queries$b = {
     };
   },
   visit_read: function visit_read(encounter_id) {
+    // return {
+    //   db_name: `${dbName}`,
+    //   entity: "Encounter",
+    //   filter: `Encounter.activestatus==true && Encounter._id=='${encounter_id}'`,
+    //   return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:MERGE(DOCUMENT(practdet.speciality),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(practdet.speciality).coding) RETURN DOCUMENT(cod))})}))})",
+    // };
     return {
       db_name: "".concat(dbName),
       entity: "Encounter",
       filter: "Encounter.activestatus==true && Encounter._id=='".concat(encounter_id, "'"),
-      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:MERGE(DOCUMENT(practdet.speciality),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(practdet.speciality).coding) RETURN DOCUMENT(cod))})}))})"
+      return_fields: "MERGE(Encounter,{reasonReference: Document(Encounter.reasonReference),practitioner_details:(FOR practdet IN TO_ARRAY(Encounter.practitioner_details) RETURN MERGE(practdet,{speciality:DOCUMENT(practdet.speciality)}))},{identifier: ( FOR IdentifierMaster IN IdentifierMaster FILTER IdentifierMaster._id in Encounter.identifier return merge(IdentifierMaster,{period:document(IdentifierMaster.period)}))},{statushistory:(for sat in TO_ARRAY(Encounter.statushistory) return merge(sat,{period:document(sat.period)}))})"
     };
   },
   get_apo_read: function get_apo_read(appointmentId) {
@@ -8169,7 +8175,7 @@ var queries$b = {
   },
   codablemasterGetPatientname: {
     query: function query(patientName) {
-      return "UPPER(DOCUMENT(Person.name)[*].text) LIKE '%".concat(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");
     },
     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)}"
   },
@@ -8482,6 +8488,87 @@ var utcTOLocal$1 = function utcTOLocal(date, format) {
 
   var fmt = format ? format : "DD-MM-YYYY";
   return moment$1.utc(Ndate).local().format(fmt);
+};
+
+var utcTOLocal_ = function utcTOLocal_(date, format) {
+  var Ndate = new Date();
+
+  if (typeof date === "number") {
+    Ndate = moment$1.unix(date);
+  } else {
+    Ndate = moment$1(date);
+  }
+
+  var fmt = format ? format : "DD-MM-YYYY";
+
+  if (format) {
+    return moment$1.utc(Ndate).local().format(fmt);
+  } else {
+    return moment$1.utc(Ndate).local();
+  }
+};
+var getNumberOfDays = function getNumberOfDays(start, end) {
+  var date1 = new Date(start);
+  var date2 = new Date(end); // One day in milliseconds
+
+  var oneDay = 1000 * 60 * 60 * 24; // Calculating the time difference between two dates
+
+  var diffInTime = date2.getTime() - date1.getTime(); // Calculating the no. of days between two dates
+
+  var diffInDays = Math.round(diffInTime / oneDay);
+  return diffInDays;
+};
+var weekCalculation = function weekCalculation(date_) {
+  var d = new Date(date_);
+  var date = d.getDate();
+  var day = d.getDay();
+  var weekOfMonth = Math.ceil((date - 1 - day) / 7);
+  return weekOfMonth;
+};
+var timeLine_ = function timeLine_(appointmentDate) {
+  //DAY CALCULATION
+  var appDate = utcTOLocal_(appointmentDate, "MM/DD/YYY");
+  var currentDate = utcTOLocal_(new Date(), "MM/DD/YYY"); //DAYS DIFFERENCE CALCULATION
+
+  var diffDays = getNumberOfDays(currentDate, appDate); //MONTH CALCULATION
+
+  var appointmentMonth = utcTOLocal_(appointmentDate, "MM");
+  var currentMonth = utcTOLocal_(new Date(), "MM"); //WEEK CALCULATION 
+
+  var appointmentWeek = weekCalculation(utcTOLocal_(appointmentDate));
+  var currentWeek = weekCalculation(new Date());
+  var type = ""; //TODAY
+
+  if (diffDays === 0) {
+    type = "TODAY";
+  } //THIS MONTH
+  else if (currentMonth === appointmentMonth) {
+      //debugger
+      //THIS WEEK
+      if (appointmentWeek === currentWeek) {
+        type = "THIS_WEEK";
+      } //LAST WEEK
+      else if (appointmentWeek + 1 === currentWeek) {
+          type = "LAST_WEEK";
+        } //NEXT WEEK
+        else if (appointmentWeek - 1 === currentWeek) {
+            type = "NEXT_WEEK";
+          } //THIS MONTH
+          else {
+              type = "THIS_MONTH";
+            }
+    } //LAST MONTH
+    else if (appointmentMonth < currentMonth) {
+        type = "LAST_MONTH";
+      } //NEXT MONTH
+      else if (appointmentMonth > currentMonth) {
+          type = "NEXT_MONTH";
+        } else {
+          type = "TODAY";
+        } // debugger
+
+
+  return type;
 }; // const getUtcTime = (date) => {
 //   let a = null
 //   if (date) {
@@ -8502,7 +8589,6 @@ var utcTOLocal$1 = function utcTOLocal(date, format) {
 //   }
 // };
 
-
 var deg2rad = function deg2rad(deg) {
   return deg * (Math.PI / 180);
 };
@@ -11609,7 +11695,16 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
           data = _context6.sent;
           returnData = {
             pastAppointment: [],
+            pastAppointmentThisWeek: [],
+            pastAppointmentLastWeek: [],
+            pastAppointmentThisMonth: [],
+            pastAppointmentLastMonth: [],
             upcomingAppointment: [],
+            upcomingAppointmentToday: [],
+            upcomingAppointmentThisWeek: [],
+            upcomingAppointmentNextWeek: [],
+            upcomingAppointmentThisMonth: [],
+            upcomingAppointmentNextMonth: [],
             followUpAppointment: [],
             currentVisist: []
           };
@@ -11617,14 +11712,40 @@ var ALL_APPOINTMENTS = createAsyncThunk("appointmentReducer/allAppointments", /*
             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 {
-              returnData.pastAppointment.push(v);
+              var type_ = timeLine_(v.start); //debugger
+
+              if (type_ === "THIS_WEEK") {
+                returnData.pastAppointmentThisWeek.push(v);
+              } else if (type_ === "LAST_WEEK") {
+                returnData.pastAppointmentLastWeek.push(v);
+              } else if (type_ === "THIS_MONTH") {
+                returnData.pastAppointmentThisMonth.push(v);
+              } else if (type_ === "LAST_MONTH") {
+                returnData.pastAppointmentLastMonth.push(v);
+              } else {
+                returnData.pastAppointment.push(v);
+              }
             }
           });
           (_data$3 = data[0]) === null || _data$3 === void 0 ? void 0 : (_data$3$upcoming_appo = _data$3.upcoming_appointment) === null || _data$3$upcoming_appo === void 0 ? void 0 : (_data$3$upcoming_appo2 = _data$3$upcoming_appo.forEach) === null || _data$3$upcoming_appo2 === void 0 ? void 0 : _data$3$upcoming_appo2.call(_data$3$upcoming_appo, function (v) {
             if (assemble && moment$1(utcTOLocal$1(v === null || v === void 0 ? void 0 : v.start), "DD-MM-YYYY").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 {
-              returnData.upcomingAppointment.push(v);
+              var type_ = timeLine_(v.start); //debugger
+
+              if (type_ === "TODAY") {
+                returnData.upcomingAppointmentToday.push(v);
+              } else if (type_ === "THIS_WEEK") {
+                returnData.upcomingAppointmentThisWeek.push(v);
+              } else if (type_ === "NEXT_WEEK") {
+                returnData.upcomingAppointmentNextWeek.push(v);
+              } else if (type_ === "THIS_MONTH") {
+                returnData.upcomingAppointmentThisMonth.push(v);
+              } else if (type_ === "NEXT_MONTH") {
+                returnData.upcomingAppointmentNextMonth.push(v);
+              } else {
+                returnData.upcomingAppointment.push(v);
+              }
             }
           });
           return _context6.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -18745,7 +18866,7 @@ var GET_ENCOUNTER_HEADER = createAsyncThunk("OrganizationRegisterPatientApiSlice
             db_name: dbName,
             entity: "Encounter",
             filter: "Encounter.patient_id == ".concat(patientId, " && Encounter.id==").concat(encounterId, " && Encounter.activestatus == true"),
-            return_fields: "merge({id:Encounter.id},{_id:Encounter._id},{_key:Encounter._key},{encounterdate:Encounter.encounterdate},{encounter_no:Encounter.encounter_no},{type:document(Encounter.type)[*].display},{visit_type:Encounter.visit_type},{location:(for doc in Encounter.location for loc in LocationMaster filter loc._id == doc.location_id return document(document(loc.locationType).coding))},{Practitioner_id:(for part in Encounter.participant for practId in Practitioner filter practId.id == part.Practitioner_id return {name:(for doc in HumanNameMaster filter doc._id in practId.name return merge(doc,{use:(document(document(doc.use).coding)),prefix:(document(document(doc.prefix).coding)),suffix:(document(document(doc.suffix).coding))}))} )},{PractitionerRole_id:(for part in Encounter.participant for practRole in PractitionerRole filter practRole.id == part.PractitionerRole_id return document(document(practRole.role).coding) )})",
+            return_fields: "merge({id:adqolcEncounter.id},{_id:adqolcEncounter._id},{_key:adqolcEncounter._key},{encounterdate:adqolcEncounter.encounterdate},{encounter_no:adqolcEncounter.encounter_no},{type:document(adqolcEncounter.type)[*].display},{visit_type:adqolcEncounter.visit_type},{location:(for doc in adqolcEncounter.location for loc in LocationMaster filter loc._id == doc.location_id return document(document(loc.locationType).coding))},{Practitioner_id:(for part in adqolcEncounter.participant for practId in Practitioner filter practId.id == part.Practitioner_id return {name:(for doc in HumanNameMaster filter doc._id in practId.name return merge(doc,{use:(document(document(doc.use).coding)),prefix:(document(document(doc.prefix).coding)),suffix:(document(document(doc.suffix).coding))})),communication:document(practId.communication)[*]} )},{PractitionerRole_id:(for part in adqolcEncounter.participant for practRole in PractitionerRole filter practRole.id == part.PractitionerRole_id return document(document(practRole.role).coding) )})",
             sort: "Encounter.encounterdate desc"
           };
           _context13.next = 7;

package/package.json

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