primarycare-binder 1.1.58 → 1.1.62

package/dist/index.cjs.js

@@ -10868,6 +10868,8 @@ var APPOINTMENT_CREATE = createAsyncThunk("appointmentReducer/upsertAppointment"
       orgId,
       _payload$orgType,
       orgType,
+      _payload$patientInstr,
+      patientInstruction,
       body,
       data,
       _args = arguments;
@@ -10879,7 +10881,7 @@ var APPOINTMENT_CREATE = createAsyncThunk("appointmentReducer/upsertAppointment"
           payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
-          _payload$slotId = payload.slotId, slotId = _payload$slotId === void 0 ? [] : _payload$slotId, _payload$slotStart = payload.slotStart, slotStart = _payload$slotStart === void 0 ? 0 : _payload$slotStart, _payload$slotEnd = payload.slotEnd, slotEnd = _payload$slotEnd === void 0 ? 0 : _payload$slotEnd, _payload$info = payload.info, info = _payload$info === void 0 ? [] : _payload$info, _payload$specialtyID = payload.specialtyID, specialtyID = _payload$specialtyID === void 0 ? [] : _payload$specialtyID, _payload$personID = payload.personID, personID = _payload$personID === void 0 ? [] : _payload$personID, _payload$practitioner = payload.practitionerId, practitionerId = _payload$practitioner === void 0 ? [] : _payload$practitioner, _payload$mobile = payload.mobile, mobile = _payload$mobile === void 0 ? "" : _payload$mobile, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, _payload$consultation = payload.consultationMode, consultationMode = _payload$consultation === void 0 ? "" : _payload$consultation, _payload$healthCareId = payload.healthCareId, healthCareId = _payload$healthCareId === void 0 ? [] : _payload$healthCareId, _payload$report_docs = payload.report_docs, report_docs = _payload$report_docs === void 0 ? [] : _payload$report_docs, _payload$appointmentT = payload.appointmentType, appointmentType = _payload$appointmentT === void 0 ? "general" : _payload$appointmentT, _payload$resourcetype = payload.resourcetype, resourcetype = _payload$resourcetype === void 0 ? "" : _payload$resourcetype, _payload$resourcerole = payload.resourcerole, resourcerole = _payload$resourcerole === void 0 ? "" : _payload$resourcerole, _payload$resourcecode = payload.resourcecode, resourcecode = _payload$resourcecode === void 0 ? "" : _payload$resourcecode, _payload$orgId = payload.orgId, orgId = _payload$orgId === void 0 ? "" : _payload$orgId, _payload$orgType = payload.orgType, orgType = _payload$orgType === void 0 ? "" : _payload$orgType;
+          _payload$slotId = payload.slotId, slotId = _payload$slotId === void 0 ? [] : _payload$slotId, _payload$slotStart = payload.slotStart, slotStart = _payload$slotStart === void 0 ? 0 : _payload$slotStart, _payload$slotEnd = payload.slotEnd, slotEnd = _payload$slotEnd === void 0 ? 0 : _payload$slotEnd, _payload$info = payload.info, info = _payload$info === void 0 ? [] : _payload$info, _payload$specialtyID = payload.specialtyID, specialtyID = _payload$specialtyID === void 0 ? [] : _payload$specialtyID, _payload$personID = payload.personID, personID = _payload$personID === void 0 ? [] : _payload$personID, _payload$practitioner = payload.practitionerId, practitionerId = _payload$practitioner === void 0 ? [] : _payload$practitioner, _payload$mobile = payload.mobile, mobile = _payload$mobile === void 0 ? "" : _payload$mobile, _payload$email = payload.email, email = _payload$email === void 0 ? "" : _payload$email, _payload$consultation = payload.consultationMode, consultationMode = _payload$consultation === void 0 ? "" : _payload$consultation, _payload$healthCareId = payload.healthCareId, healthCareId = _payload$healthCareId === void 0 ? [] : _payload$healthCareId, _payload$report_docs = payload.report_docs, report_docs = _payload$report_docs === void 0 ? [] : _payload$report_docs, _payload$appointmentT = payload.appointmentType, appointmentType = _payload$appointmentT === void 0 ? "general" : _payload$appointmentT, _payload$resourcetype = payload.resourcetype, resourcetype = _payload$resourcetype === void 0 ? "" : _payload$resourcetype, _payload$resourcerole = payload.resourcerole, resourcerole = _payload$resourcerole === void 0 ? "" : _payload$resourcerole, _payload$resourcecode = payload.resourcecode, resourcecode = _payload$resourcecode === void 0 ? "" : _payload$resourcecode, _payload$orgId = payload.orgId, orgId = _payload$orgId === void 0 ? "" : _payload$orgId, _payload$orgType = payload.orgType, orgType = _payload$orgType === void 0 ? "" : _payload$orgType, _payload$patientInstr = payload.patientInstruction, patientInstruction = _payload$patientInstr === void 0 ? "" : _payload$patientInstr;
           body = [{
             db_name: dbName,
             entity: "Appointment",
@@ -10907,6 +10909,7 @@ var APPOINTMENT_CREATE = createAsyncThunk("appointmentReducer/upsertAppointment"
               // appointment reason
               basedOn: [],
               participant: [],
+              patientInstruction: patientInstruction,
               requestedPeriod: [{
                 // slot in milliseconds
                 start: new Date(slotStart).getTime(),
@@ -12306,6 +12309,7 @@ var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApooi
       appBody,
       appData,
       appInfo,
+      insertObject,
       body,
       data,
       _args15 = arguments;
@@ -12335,78 +12339,55 @@ var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApooi
           appInfo = (appData === null || appData === void 0 ? void 0 : (_appData$ = appData[0]) === null || _appData$ === void 0 ? void 0 : _appData$[0]) || {};
 
           if (!(Object.keys(appInfo).length > 0)) {
-            _context15.next = 31;
+            _context15.next = 19;
             break;
           }
 
-          appInfo["requestedPeriod"] = [{
+          insertObject = {};
+          insertObject["requestedPeriod"] = [{
             start: new Date(appInfo.start).getTime(),
             end: new Date(appInfo.end).getTime()
           }];
-          appInfo["status"] = false;
-          appInfo["cancelationReason"] = [{
-            coding: [{
-              system: "string",
-              code: "string",
-              userSelected: true,
-              display: reason || "Others",
-              id: Math.floor(Date.now() / 1000),
-              version: "string"
-            }],
-            text: reason || "Others",
-            id: Math.floor(Date.now() / 1000)
-          }];
-          delete appInfo["Speciality"];
-          delete appInfo["Person"];
-          delete appInfo["Practioner"];
-          delete appInfo["Slots"];
-          delete appInfo["healthservice"];
-          delete appInfo["updatedate"];
-          delete appInfo["updatedby"];
-          delete appInfo["createddate"];
-          delete appInfo["createdby"];
-          delete appInfo["activestatus"];
-          delete appInfo["_rev"];
-          delete appInfo["_id"];
-          delete appInfo["_key"];
+          insertObject["status"] = false;
+          insertObject["cancelationReason"] = [reason];
           body = [{
             db_name: dbName,
             entity: "Appointment",
             is_metadata: true,
             metadataId: query_ids["appointmentReducer/upsertAppointment"],
-            doc: _objectSpread2({}, appInfo),
+            doc: _objectSpread2({}, insertObject),
             filter: {
               id: appointmentId
             }
           }];
-          _context15.next = 29;
+          _context15.next = 17;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
-        case 29:
+        case 17:
           data = _context15.sent;
           return _context15.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
-        case 31:
-          _context15.next = 36;
+        case 19:
+          _context15.next = 24;
           break;
 
-        case 33:
-          _context15.prev = 33;
+        case 21:
+          _context15.prev = 21;
           _context15.t0 = _context15["catch"](2);
           return _context15.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context15.t0.message
           })));
 
-        case 36:
+        case 24:
         case "end":
           return _context15.stop();
       }
     }
-  }, _callee15, null, [[2, 33]]);
+  }, _callee15, null, [[2, 21]]);
 }))); // REASON_FOR_APPT_CANCEL_MODIFY
 
 var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonForApptCancelModify", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
@@ -19311,7 +19292,8 @@ var dashboardQuery = {
         Encounter: "Encounter._key=='".concat(encounter_key, "' && Encounter.activestatus==true && lower(document(Encounter.status).display)=='consultation over'"),
         Appointment: "Appointment.id in Encounter.appointmentId && Appointment.start>=".concat(start, " && Appointment.end<=").concat(end)
       },
-      return_fields: "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{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:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))},{Followupdetails:(for app in AppointmentRequest filter app.encounterid==Encounter._id return merge(app,{followupduruom:document(app.followupduruom)},{followupreason:document(app.followupreason)}))})"
+      return_fields: // "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))},{reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{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:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))},{Followupdetails:(for app in AppointmentRequest filter app.encounterid==Encounter._id return merge(app,{followupduruom:document(app.followupduruom)},{followupreason:document(app.followupreason)}))})",
+      "merge(Encounter,{patient_id:(for pat in Patient filter pat.id==Encounter.patient_id return merge(pat,{name:(for nam in HumanNameMaster filter nam._id in pat.name return merge(nam,{use:document(nam.use),suffix:document(nam.suffix),prefix:document(nam.prefix)})),telecom:document(pat.telecom),gender:document(pat.gender),age_type:document(pat.age_type)},{photo:document(pat.photo)}))}, {statushistoryExp:(for she in Encounter.statushistory return merge(she,{period:document(she.period)},{status:document(she.status)}))} , {reasonReference:document(Encounter.reasonReference)},{appointmentId: merge(Appointment,{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:(for cod in CodeableConceptMaster filter cod._id == nam.use return document(cod.coding)),prefix:(for cod in CodeableConceptMaster filter cod._id == nam.prefix return document(cod.coding)),suffix:(for cod in CodeableConceptMaster filter cod._id == nam.suffix return document(cod.coding))}))},{photo:document(prac.photo)})),HealthcareServiceID:(for hs in HealthcareService filter hs.id in Appointment.HealthcareServiceID return hs)},{appointmentReason:(for apr in CodingMaster filter apr.id in Appointment.appointmentReason return apr)})},{followupUOM:document(Encounter.followupUOM),reasonCode:document(Encounter.reasonCode),dischargeDisposition:document(Encounter.dischargeDisposition)},{practitioner_details:(for pd in Encounter.practitioner_details return merge(pd,{speciality:(for spd in CodeableConceptMaster filter spd._id == pd.speciality return merge(spd,{coding:document(spd.coding)}))}))},{Followupdetails:(for app in AppointmentRequest filter app.encounterid==Encounter._id return merge(app,{followupduruom:document(app.followupduruom)},{followupreason:document(app.followupreason)}))})"
     };
   }
 };
@@ -20783,7 +20765,8 @@ var generateReadJSON_colseConsultation = function generateReadJSON_colseConsulta
     encounterId: data === null || data === void 0 ? void 0 : data._id,
     patientId: data === null || data === void 0 ? void 0 : (_data$patient_id9 = data.patient_id) === null || _data$patient_id9 === void 0 ? void 0 : (_data$patient_id9$ = _data$patient_id9[0]) === null || _data$patient_id9$ === void 0 ? void 0 : _data$patient_id9$._id,
     appointmentId: data === null || data === void 0 ? void 0 : (_data$appointmentId7 = data.appointmentId) === null || _data$appointmentId7 === void 0 ? void 0 : _data$appointmentId7.id,
-    followupReqd: (data === null || data === void 0 ? void 0 : data.followupReqd) ? data === null || data === void 0 ? void 0 : data.followupReqd : false
+    followupReqd: (data === null || data === void 0 ? void 0 : data.followupReqd) ? data === null || data === void 0 ? void 0 : data.followupReqd : false,
+    encounterCloseTime: data === null || data === void 0 ? void 0 : data.statushistoryExp
   };
   return json;
 };

package/package.json

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