primarycare-binder 1.1.110 → 1.1.113

package/dist/index.cjs.js

@@ -12418,14 +12418,67 @@ var GET_SPECIALITY_ID_BY_PRCTITIONER_ID = createAsyncThunk("appointmentReducer/g
       }
     }
   }, _callee13, null, [[2, 12]]);
-}))); // RECCURANCE_APPOINTMENT
-
-var RECCURANCE_APPOINTMENT = createAsyncThunk("appointmentReducer/reccuranceAppointment", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
+})));
+var CHECK_APPOINTMENT_AGAINST_PATIENT = createAsyncThunk("appointmentReducer/checkAppointmentAgainstPatient", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
       _ref29,
       rejectWithValue,
+      _payload$patientId,
+      patientId,
       _payload$start3,
       start,
+      body,
+      data,
+      _args14 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee14$(_context14) {
+    while (1) {
+      switch (_context14.prev = _context14.next) {
+        case 0:
+          payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
+          _ref29 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref29.rejectWithValue;
+          _context14.prev = 2;
+          _payload$patientId = payload.patientId, patientId = _payload$patientId === void 0 ? 0 : _payload$patientId, _payload$start3 = payload.start, start = _payload$start3 === void 0 ? 0 : _payload$start3;
+          debugger;
+          body = {
+            db_name: dbName,
+            entity: "Appointment",
+            filter: "Appointment.PersonID any ==".concat(patientId, " && Appointment.start ==").concat(start, "  && Appointment.activestatus==true"),
+            return_fields: "{_id:Appointment._id,PersonID:Appointment.PersonID,_key:Appointment._key,appno:Appointment.appno,id:Appointment.id,start:Appointment.start,slotID:Appointment.slotID,end:Appointment.end,doctorName:CONCAT(CONTAINS(document(document(Appointment.resourcecode).name)[*].prefix,'CodeableConceptMaster')?first(document(first(document(document(document(Appointment.resourcecode).name)[*].prefix)[*].coding))[*].display):first(document(document(document(Appointment.resourcecode).name)[*].prefix)[*].display),'. ',first(document(document(Appointment.resourcecode).name)[*].text),' ',first(document(document(Appointment.resourcecode).name)[*].given),' ',first(document(document(Appointment.resourcecode).name)[*].family),' ',CONTAINS(document(document(Appointment.resourcecode).name)[*].suffix,'CodeableConceptMaster')?first(document(first(document(document(document(Appointment.resourcecode).name)[*].suffix)[*].coding))[*].display):first(document(document(document(Appointment.resourcecode).name)[*].suffix)[*].display)),allowToBookAppointment:CONTAINS(document(Appointment.resourcecode).name,'HumanNameMaster')?false:true}"
+          };
+          _context14.next = 8;
+          return fetchData$3({
+            body: JSON.stringify(body)
+          }, __readDocumentUrl__);
+
+        case 8:
+          data = _context14.sent;
+          debugger;
+          return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: data
+          }));
+
+        case 13:
+          _context14.prev = 13;
+          _context14.t0 = _context14["catch"](2);
+          return _context14.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context14.t0.message
+          })));
+
+        case 16:
+        case "end":
+          return _context14.stop();
+      }
+    }
+  }, _callee14, null, [[2, 13]]);
+}))); // RECCURANCE_APPOINTMENT
+
+var RECCURANCE_APPOINTMENT = createAsyncThunk("appointmentReducer/reccuranceAppointment", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
+  var payload,
+      _ref31,
+      rejectWithValue,
+      _payload$start4,
+      start,
       _payload$practionerid,
       practionerid,
       _payload$clinicid,
@@ -12435,16 +12488,16 @@ var RECCURANCE_APPOINTMENT = createAsyncThunk("appointmentReducer/reccuranceAppo
       queryId,
       body,
       data,
-      _args14 = arguments;
+      _args15 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee14$(_context14) {
+  return regeneratorRuntime.wrap(function _callee15$(_context15) {
     while (1) {
-      switch (_context14.prev = _context14.next) {
+      switch (_context15.prev = _context15.next) {
         case 0:
-          payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-          _ref29 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref29.rejectWithValue;
-          _context14.prev = 2;
-          _payload$start3 = payload.start, start = _payload$start3 === void 0 ? [] : _payload$start3, _payload$practionerid = payload.practionerid, practionerid = _payload$practionerid === void 0 ? 0 : _payload$practionerid, _payload$clinicid = payload.clinicid, clinicid = _payload$clinicid === void 0 ? 0 : _payload$clinicid;
+          payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+          _ref31 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref31.rejectWithValue;
+          _context15.prev = 2;
+          _payload$start4 = payload.start, start = _payload$start4 === void 0 ? [] : _payload$start4, _payload$practionerid = payload.practionerid, practionerid = _payload$practionerid === void 0 ? 0 : _payload$practionerid, _payload$clinicid = payload.clinicid, clinicid = _payload$clinicid === void 0 ? 0 : _payload$clinicid;
           date = start.map(function (d) {
             var startDate = new Date();
             var endDate = new Date();
@@ -12476,35 +12529,35 @@ var RECCURANCE_APPOINTMENT = createAsyncThunk("appointmentReducer/reccuranceAppo
               slotdate: getUtcTime(new Date())
             })
           };
-          _context14.next = 11;
+          _context15.next = 11;
           return fetchData$3({
             body: JSON.stringify(body)
           });
 
         case 11:
-          data = _context14.sent;
-          return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context15.sent;
+          return _context15.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
         case 15:
-          _context14.prev = 15;
-          _context14.t0 = _context14["catch"](2);
-          return _context14.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context14.t0.message
+          _context15.prev = 15;
+          _context15.t0 = _context15["catch"](2);
+          return _context15.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context15.t0.message
           })));
 
         case 18:
         case "end":
-          return _context14.stop();
+          return _context15.stop();
       }
     }
-  }, _callee14, null, [[2, 15]]);
+  }, _callee15, null, [[2, 15]]);
 }))); // UPDATE_APPOINTMENT_STATUS
 
-var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
+var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
   var payload,
-      _ref31,
+      _ref33,
       rejectWithValue,
       _payload$appointmentI2,
       appointmentId,
@@ -12519,7 +12572,7 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
       _encounterInfo$result,
       encounterCode,
       encounterInfo,
-      _ref32,
+      _ref34,
       _id,
       _key,
       statushistory,
@@ -12527,15 +12580,15 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
       appInfo,
       body,
       data,
-      _args15 = arguments;
+      _args16 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee15$(_context15) {
+  return regeneratorRuntime.wrap(function _callee16$(_context16) {
     while (1) {
-      switch (_context15.prev = _context15.next) {
+      switch (_context16.prev = _context16.next) {
         case 0:
-          payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
-          _ref31 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref31.rejectWithValue;
-          _context15.prev = 2;
+          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+          _ref33 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref33.rejectWithValue;
+          _context16.prev = 2;
           _payload$appointmentI2 = payload.appointmentId, appointmentId = _payload$appointmentI2 === void 0 ? 0 : _payload$appointmentI2, _payload$status = payload.status, status = _payload$status === void 0 ? "" : _payload$status, _payload$isCompleted = payload.isCompleted, isCompleted = _payload$isCompleted === void 0 ? false : _payload$isCompleted; // const appBody = {
           //   db_name: dbName,
           //   queryid: query_ids["appointmentReducer/readAppointment"],
@@ -12562,11 +12615,11 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }
 
           if (!encounterStatus) {
-            _context15.next = 20;
+            _context16.next = 20;
             break;
           }
 
-          _context15.next = 8;
+          _context16.next = 8;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -12577,9 +12630,9 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }, __readDocumentUrl__);
 
         case 8:
-          encounterCode = _context15.sent;
+          encounterCode = _context16.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 : "";
-          _context15.next = 12;
+          _context16.next = 12;
           return fetchData$3({
             body: JSON.stringify({
               db_name: dbName,
@@ -12590,11 +12643,11 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
           }, __readDocumentUrl__);
 
         case 12:
-          encounterInfo = _context15.sent;
-          _ref32 = (encounterInfo === null || encounterInfo === void 0 ? void 0 : (_encounterInfo$result = encounterInfo.result) === null || _encounterInfo$result === void 0 ? void 0 : _encounterInfo$result[0]) || {}, _id = _ref32._id, _key = _ref32._key, statushistory = _ref32.statushistory;
+          encounterInfo = _context16.sent;
+          _ref34 = (encounterInfo === null || encounterInfo === void 0 ? void 0 : (_encounterInfo$result = encounterInfo.result) === null || _encounterInfo$result === void 0 ? void 0 : _encounterInfo$result[0]) || {}, _id = _ref34._id, _key = _ref34._key, statushistory = _ref34.statushistory;
 
           if (!(_id && _key && statushistory && Array.isArray(statushistory))) {
-            _context15.next = 20;
+            _context16.next = 20;
             break;
           }
 
@@ -12631,7 +12684,7 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               status: encounterStatus
             }
           }];
-          _context15.next = 20;
+          _context16.next = 20;
           return fetchData$3({
             body: JSON.stringify(updateData)
           }, __uspsertUrl__);
@@ -12657,34 +12710,34 @@ var UPDATE_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/updateAppoi
               id: appointmentId
             }
           }];
-          _context15.next = 26;
+          _context16.next = 26;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
         case 26:
-          data = _context15.sent;
-          return _context15.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context16.sent;
+          return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
         case 30:
-          _context15.prev = 30;
-          _context15.t0 = _context15["catch"](2);
-          return _context15.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context15.t0.message
+          _context16.prev = 30;
+          _context16.t0 = _context16["catch"](2);
+          return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context16.t0.message
           })));
 
         case 33:
         case "end":
-          return _context15.stop();
+          return _context16.stop();
       }
     }
-  }, _callee15, null, [[2, 30]]);
+  }, _callee16, null, [[2, 30]]);
 })));
-var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApoointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
+var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApoointmentStatus", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
   var payload,
-      _ref34,
+      _ref36,
       rejectWithValue,
       _appData$,
       _payload$appointmentI3,
@@ -12697,15 +12750,15 @@ var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApooi
       insertObject,
       body,
       data,
-      _args16 = arguments;
+      _args17 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee16$(_context16) {
+  return regeneratorRuntime.wrap(function _callee17$(_context17) {
     while (1) {
-      switch (_context16.prev = _context16.next) {
+      switch (_context17.prev = _context17.next) {
         case 0:
-          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
-          _ref34 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref34.rejectWithValue;
-          _context16.prev = 2;
+          payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
+          _ref36 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
+          _context17.prev = 2;
           _payload$appointmentI3 = payload.appointmentId, appointmentId = _payload$appointmentI3 === void 0 ? 0 : _payload$appointmentI3, _payload$reason = payload.reason, reason = _payload$reason === void 0 ? "" : _payload$reason;
           appBody = {
             db_name: dbName,
@@ -12714,17 +12767,17 @@ var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApooi
               appointment_id: appointmentId
             }
           };
-          _context16.next = 7;
+          _context17.next = 7;
           return fetchData$3({
             body: JSON.stringify(appBody)
           });
 
         case 7:
-          appData = _context16.sent;
+          appData = _context17.sent;
           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)) {
-            _context16.next = 19;
+            _context17.next = 19;
             break;
           }
 
@@ -12745,53 +12798,53 @@ var CANCEL_APPOINTMENT_STATUS = createAsyncThunk("appointmentReducer/cancelApooi
               id: appointmentId
             }
           }];
-          _context16.next = 17;
+          _context17.next = 17;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
 
         case 17:
-          data = _context16.sent;
-          return _context16.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context17.sent;
+          return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
         case 19:
-          _context16.next = 24;
+          _context17.next = 24;
           break;
 
         case 21:
-          _context16.prev = 21;
-          _context16.t0 = _context16["catch"](2);
-          return _context16.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context16.t0.message
+          _context17.prev = 21;
+          _context17.t0 = _context17["catch"](2);
+          return _context17.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context17.t0.message
           })));
 
         case 24:
         case "end":
-          return _context16.stop();
+          return _context17.stop();
       }
     }
-  }, _callee16, null, [[2, 21]]);
+  }, _callee17, null, [[2, 21]]);
 }))); // REASON_FOR_APPT_CANCEL_MODIFY
 
-var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonForApptCancelModify", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
+var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonForApptCancelModify", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
   var payload,
-      _ref36,
+      _ref38,
       rejectWithValue,
       body,
       data,
       returnData,
       _data$result3,
-      _args17 = arguments;
+      _args18 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee17$(_context17) {
+  return regeneratorRuntime.wrap(function _callee18$(_context18) {
     while (1) {
-      switch (_context17.prev = _context17.next) {
+      switch (_context18.prev = _context18.next) {
         case 0:
-          payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
-          _ref36 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref36.rejectWithValue;
-          _context17.prev = 2;
+          payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
+          _ref38 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref38.rejectWithValue;
+          _context18.prev = 2;
           body = {
             db_name: dbName,
             entity: "CodingMaster",
@@ -12799,13 +12852,13 @@ var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonF
             sort: "CodingMaster.display ASC",
             return_fields: "KEEP(CodingMaster,'_id','id','_key','code','display','Type')"
           };
-          _context17.next = 6;
+          _context18.next = 6;
           return fetchData$3({
             body: JSON.stringify(body)
           }, __readDocumentUrl__);
 
         case 6:
-          data = _context17.sent;
+          data = _context18.sent;
           returnData = [];
 
           if (Array.isArray(data === null || data === void 0 ? void 0 : data.result)) {
@@ -12820,23 +12873,23 @@ var REASON_FOR_APPT_CANCEL_MODIFY = createAsyncThunk("appointmentReducer/reasonF
             });
           }
 
-          return _context17.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          return _context18.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: returnData
           }));
 
         case 12:
-          _context17.prev = 12;
-          _context17.t0 = _context17["catch"](2);
-          return _context17.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context17.t0.message
+          _context18.prev = 12;
+          _context18.t0 = _context18["catch"](2);
+          return _context18.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context18.t0.message
           })));
 
         case 15:
         case "end":
-          return _context17.stop();
+          return _context18.stop();
       }
     }
-  }, _callee17, null, [[2, 12]]);
+  }, _callee18, null, [[2, 12]]);
 }))); // APPOINTMENT CREATE INITIALSTATE
 
 var appointmentReducer = createSlice({
@@ -12861,7 +12914,8 @@ var appointmentReducer = createSlice({
     follow_up_appintment: _objectSpread2({}, defaultState.Info),
     reasonForApptCancelModify: _objectSpread2({}, defaultState.Info),
     getReferralLocation: _objectSpread2({}, defaultState.List),
-    getSpecialityIdByPractitionerId: _objectSpread2({}, defaultState.Info)
+    getSpecialityIdByPractitionerId: _objectSpread2({}, defaultState.Info),
+    checkAppointmentAgainstPatient: _objectSpread2({}, defaultState.Info)
   },
   extraReducers: (_extraReducers$D = {}, _defineProperty(_extraReducers$D, APPOINTMENT_CREATE.fulfilled, function (state, action) {
     var _action$payload;
@@ -13033,6 +13087,16 @@ var appointmentReducer = createSlice({
     var _action$payload34;
 
     state.getSpecialityIdByPractitionerId = (_action$payload34 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload34 !== void 0 ? _action$payload34 : [];
+  }), _defineProperty(_extraReducers$D, CHECK_APPOINTMENT_AGAINST_PATIENT.fulfilled, function (state, action) {
+    var _action$payload35;
+
+    state.checkAppointmentAgainstPatient = (_action$payload35 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload35 !== void 0 ? _action$payload35 : [];
+  }), _defineProperty(_extraReducers$D, CHECK_APPOINTMENT_AGAINST_PATIENT.pending, function (state, action) {
+    state.checkAppointmentAgainstPatient.loading = true;
+  }), _defineProperty(_extraReducers$D, CHECK_APPOINTMENT_AGAINST_PATIENT.rejected, function (state, action) {
+    var _action$payload36;
+
+    state.checkAppointmentAgainstPatient = (_action$payload36 = action === null || action === void 0 ? void 0 : action.payload) !== null && _action$payload36 !== void 0 ? _action$payload36 : [];
   }), _extraReducers$D)
 }); // end
 // APPOINTMENT ACTION LISTS
@@ -13054,7 +13118,8 @@ var appointmentActions = {
   GET__FOLLOW_UP_APPOINTMENT: GET__FOLLOW_UP_APPOINTMENT,
   REASON_FOR_APPT_CANCEL_MODIFY: REASON_FOR_APPT_CANCEL_MODIFY,
   GET_REFERRAL_LOCATION: GET_REFERRAL_LOCATION,
-  GET_SPECIALITY_ID_BY_PRCTITIONER_ID: GET_SPECIALITY_ID_BY_PRCTITIONER_ID
+  GET_SPECIALITY_ID_BY_PRCTITIONER_ID: GET_SPECIALITY_ID_BY_PRCTITIONER_ID,
+  CHECK_APPOINTMENT_AGAINST_PATIENT: CHECK_APPOINTMENT_AGAINST_PATIENT
 }; // end
 var appointmentReducer$1 = appointmentReducer.reducer;
 
@@ -18472,6 +18537,7 @@ var ORGANIZATION_VISIT_REGISTRATION = createAsyncThunk("OrganizationRegisterPati
       rejectWithValue,
       payloaddata,
       enId,
+      encounterId,
       body,
       data,
       _args2 = arguments;
@@ -18484,7 +18550,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({
@@ -18496,6 +18562,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,
@@ -22736,7 +22812,7 @@ var queries$a = {
   relationship: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='RELATIONSHIP' && CodeableConceptMaster.status==true\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   symptoms: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"SymptomsMapping\",\n        \"return_fields\": \"SymptomsMapping\"\n        }"),
   Severity: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCSEVERITY'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
-  bodySite: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCBODYSITE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
+  bodySite: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.status == true && CodeableConceptMaster.Type=='CCBODYSITE'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   Verification: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCVERIFICTIONSTATUS'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   clinicalStatus: "{\n        \"db_name\": \"".concat(dbName, "\",\n        \"entity\": \"CodeableConceptMaster\",\n        \"filter\": \"CodeableConceptMaster.Type=='CCCLINICALSTATUS'\",\n        \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n        }"),
   encounterBasedCC: function encounterBasedCC(encounter_id) {
@@ -28864,6 +28940,7 @@ var generateJSON$3 = function generateJSON(dataList) {
 };
 
 var childJSON$2 = function childJSON(dataList, editIds, edit, vId) {
+  debugger;
   var payload = dataList.map(function (data, i) {
     var _data$orderCatalog, _data$occuranceEndDat, _data$orderQty, _data$status, _data$reasonCode, _data$indications, _data$notes, _data$attribute$view, _data$attribute, _data$attribute$bedSi, _data$attribute2, _data$attribute$contr, _data$attribute3, _data$statusreason, _data$accessionNum;
 
@@ -28907,7 +28984,7 @@ var childJSON$2 = function childJSON(dataList, editIds, edit, vId) {
         orderMode: data === null || data === void 0 ? void 0 : data.orderMode,
         priority: data === null || data === void 0 ? void 0 : data.priority,
         orderDateTime: data === null || data === void 0 ? void 0 : data.orderDateTime,
-        occuranceStartDate: vId > 0 ? vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
+        occuranceStartDate: vId > 0 ? !edit ? getActualDate$2(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
         occuranceEndDate: (_data$occuranceEndDat = data === null || data === void 0 ? void 0 : data.occuranceEndDate) !== null && _data$occuranceEndDat !== void 0 ? _data$occuranceEndDat : 0,
         orderQty: (_data$orderQty = data === null || data === void 0 ? void 0 : data.orderQty) !== null && _data$orderQty !== void 0 ? _data$orderQty : 0,
         orderUOM: "",
@@ -28916,7 +28993,7 @@ var childJSON$2 = function childJSON(dataList, editIds, edit, vId) {
         workflowStatus: "",
         billQty: 0,
         orderPrivilegeLevel: 0,
-        apptDate: vId,
+        apptDate: !edit ? getActualDate$2(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId,
         apptRefNum: "",
         Requestor: _toConsumableArray(data === null || data === void 0 ? void 0 : data.Requestor),
         reasonCode: (_data$reasonCode = data === null || data === void 0 ? void 0 : data.reasonCode) !== null && _data$reasonCode !== void 0 ? _data$reasonCode : "",
@@ -28929,7 +29006,7 @@ var childJSON$2 = function childJSON(dataList, editIds, edit, vId) {
         freqRateUnit: "",
         duration: 0,
         durationType: "",
-        parentOrderId: edit ? data.editId : editIds ? editIds : "",
+        parentOrderId: edit ? data === null || data === void 0 ? void 0 : data.parentOrderId : editIds ? editIds : "",
         orderGroupRefId: "",
         specimenRelated: [{
           reqd: data.specimenRelated[0].reqd,
@@ -28972,6 +29049,17 @@ var childJSON$2 = function childJSON(dataList, editIds, edit, vId) {
   return payload;
 };
 
+var getActualDate$2 = function getActualDate(incomingDate, actualDate) {
+  debugger;
+  var actualFormat = moment$1.unix(actualDate).format("YYYY-MM-DD,hh:mm A");
+  var incomingFormat = moment$1.unix(incomingDate).format("YYYY-MM-DD,hh:mm A");
+  var requiredTime = actualFormat.split(","); //Got the time
+
+  var requiredDate = incomingFormat.slice(0, 11);
+  var requiredFormat = moment$1(requiredDate + requiredTime, 'YYYY-MM-DD,hh:mm A').unix();
+  return requiredFormat;
+};
+
 var queries$6 = {
   laborder_read: function laborder_read(encounter_id, order_id) {
     return {
@@ -31774,7 +31862,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, _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,
@@ -31787,12 +31875,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}`,
 
             }));
           });
@@ -34742,7 +34833,7 @@ var childJSON$1 = function childJSON(dataList, editIds, edit, vId) {
         orderMode: data === null || data === void 0 ? void 0 : data.orderMode,
         priority: data === null || data === void 0 ? void 0 : data.priority,
         orderDateTime: data === null || data === void 0 ? void 0 : data.orderDateTime,
-        occuranceStartDate: vId > 0 ? vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
+        occuranceStartDate: vId > 0 ? !edit ? getActualDate$1(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
         occuranceEndDate: (_data$occuranceEndDat = data === null || data === void 0 ? void 0 : data.occuranceEndDate) !== null && _data$occuranceEndDat !== void 0 ? _data$occuranceEndDat : 0,
         orderQty: (_data$orderQty = data === null || data === void 0 ? void 0 : data.orderQty) !== null && _data$orderQty !== void 0 ? _data$orderQty : 0,
         orderUOM: "",
@@ -34751,7 +34842,7 @@ var childJSON$1 = function childJSON(dataList, editIds, edit, vId) {
         workflowStatus: "",
         billQty: 0,
         orderPrivilegeLevel: 0,
-        apptDate: vId,
+        apptDate: !edit ? getActualDate$1(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId,
         apptRefNum: "",
         Requestor: _toConsumableArray(data === null || data === void 0 ? void 0 : data.Requestor),
         reasonCode: (_data$reasonCode = data === null || data === void 0 ? void 0 : data.reasonCode) !== null && _data$reasonCode !== void 0 ? _data$reasonCode : "",
@@ -34764,7 +34855,7 @@ var childJSON$1 = function childJSON(dataList, editIds, edit, vId) {
         freqRateUnit: "",
         duration: 0,
         durationType: "",
-        parentOrderId: edit ? data.editId : editIds ? editIds : "",
+        parentOrderId: edit ? data === null || data === void 0 ? void 0 : data.parentOrderId : editIds ? editIds : "",
         orderGroupRefId: "",
         performer: _toConsumableArray(data === null || data === void 0 ? void 0 : data.performer),
         notes: (_data$notes = data === null || data === void 0 ? void 0 : data.notes) !== null && _data$notes !== void 0 ? _data$notes : "",
@@ -34796,6 +34887,16 @@ var childJSON$1 = function childJSON(dataList, editIds, edit, vId) {
   return payload;
 };
 
+var getActualDate$1 = function getActualDate(incomingDate, actualDate) {
+  var actualFormat = moment$1.unix(actualDate).format("YYYY-MM-DD,hh:mm A");
+  var incomingFormat = moment$1.unix(incomingDate).format("YYYY-MM-DD,hh:mm A");
+  var requiredTime = actualFormat.split(","); //Got the time
+
+  var requiredDate = incomingFormat.slice(0, 11);
+  var requiredFormat = moment$1(requiredDate + requiredTime, 'YYYY-MM-DD,hh:mm A').unix();
+  return requiredFormat;
+};
+
 var _extraReducers$f;
 var TREATMENT_PROCEDURE_SAVE = createAsyncThunk("DiagnosisMasterSlice/savetreatment", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
   var payload,
@@ -36668,7 +36769,7 @@ var childJSON = function childJSON(dataList, editIds, edit, vId) {
         orderMode: data === null || data === void 0 ? void 0 : data.orderMode,
         priority: data === null || data === void 0 ? void 0 : data.priority,
         orderDateTime: data === null || data === void 0 ? void 0 : data.orderDateTime,
-        occuranceStartDate: vId > 0 ? vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
+        occuranceStartDate: vId > 0 ? !edit ? getActualDate(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId : data === null || data === void 0 ? void 0 : data.occuranceStartDate,
         occuranceEndDate: (_data$occuranceEndDat = data === null || data === void 0 ? void 0 : data.occuranceEndDate) !== null && _data$occuranceEndDat !== void 0 ? _data$occuranceEndDat : 0,
         orderQty: (_data$orderQty = data === null || data === void 0 ? void 0 : data.orderQty) !== null && _data$orderQty !== void 0 ? _data$orderQty : 0,
         orderUOM: "",
@@ -36677,7 +36778,7 @@ var childJSON = function childJSON(dataList, editIds, edit, vId) {
         workflowStatus: "",
         billQty: 0,
         orderPrivilegeLevel: 0,
-        apptDate: vId,
+        apptDate: !edit ? getActualDate(vId, data === null || data === void 0 ? void 0 : data.starts_on) : vId,
         apptRefNum: "",
         Requestor: _toConsumableArray(data === null || data === void 0 ? void 0 : data.Requestor),
         reasonCode: (_data$reasonCode = data === null || data === void 0 ? void 0 : data.reasonCode) !== null && _data$reasonCode !== void 0 ? _data$reasonCode : "",
@@ -36690,7 +36791,7 @@ var childJSON = function childJSON(dataList, editIds, edit, vId) {
         freqRateUnit: "",
         duration: 0,
         durationType: "",
-        parentOrderId: edit ? data.editId : editIds ? editIds : "",
+        parentOrderId: edit ? data === null || data === void 0 ? void 0 : data.parentOrderId : editIds ? editIds : "",
         orderGroupRefId: "",
         performer: _toConsumableArray(data === null || data === void 0 ? void 0 : data.performer),
         notes: (_data$notes = data === null || data === void 0 ? void 0 : data.notes) !== null && _data$notes !== void 0 ? _data$notes : "",
@@ -36722,6 +36823,16 @@ var childJSON = function childJSON(dataList, editIds, edit, vId) {
   return payload;
 };
 
+var getActualDate = function getActualDate(incomingDate, actualDate) {
+  var actualFormat = moment$1.unix(actualDate).format("YYYY-MM-DD,hh:mm A");
+  var incomingFormat = moment$1.unix(incomingDate).format("YYYY-MM-DD,hh:mm A");
+  var requiredTime = actualFormat.split(","); //Got the time
+
+  var requiredDate = incomingFormat.slice(0, 11);
+  var requiredFormat = moment$1(requiredDate + requiredTime, 'YYYY-MM-DD,hh:mm A').unix();
+  return requiredFormat;
+};
+
 var _extraReducers$e;
 var READ_RAD_CHILD = createAsyncThunk("RadiologySlice/rad_child", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
   var payload,
@@ -38709,7 +38820,20 @@ var queries$2 = {
       return_fields: " {Practitioner_id:(for doc in Practitioner filter doc.id in Encounter.participant[*].Practitioner_id return {name:document(doc.name),_id:doc._id})}"
     };
   },
-  doc_read: "{\n  \"db_name\": \"".concat(dbName, "\",\n  \"entity\": \"CAPatientClinicalDocs\",\n  \"filter\": \"CAPatientClinicalDocs.activestatus ==true\",\n  \"return_fields\": \"MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:document(CAPatientClinicalDocs.practitionerid)},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})\"\n}"),
+  doc_read: function doc_read(patient_id) {
+    return {
+      db_name: dbName,
+      entity: "CAPatientClinicalDocs",
+      filter: "CAPatientClinicalDocs.patientid =='".concat(patient_id, "' && CAPatientClinicalDocs.activestatus ==true"),
+      return_fields: "MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:document(CAPatientClinicalDocs.practitionerid)},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})"
+    };
+  } //    `{
+  //   "db_name": "${dbName}",
+  //   "entity": "CAPatientClinicalDocs",
+  //   "filter": "CAPatientClinicalDocs.activestatus ==true",
+  //   "return_fields": "MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:document(CAPatientClinicalDocs.practitionerid)},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})"
+  // }`,
+  ,
   doc_single_read: function doc_single_read(key) {
     return {
       db_name: dbName,
@@ -38718,13 +38842,14 @@ var queries$2 = {
       return_fields: "MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:(for pract in Practitioner filter pract._id == CAPatientClinicalDocs.practitionerid return merge(pract,{name:(for doc in HumanNameMaster filter doc._id in pract.name return merge(doc,{use:(document(doc.use)),prefix:(document(doc.prefix)),suffix:(document(doc.suffix))})) ,practitioner_role:(FOR practrole IN TO_ARRAY(pract.practitioner_role) RETURN MERGE(DOCUMENT(practrole),{'role':MERGE(DOCUMENT(DOCUMENT(practrole).role),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(practrole).role).coding) RETURN DOCUMENT(cod) )}) }) ) }))},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})"
     };
   },
-  doc_agnst_category: function doc_agnst_category(category, speciality, encoumter, practitioner) {
-    return {
+  doc_agnst_category: function doc_agnst_category(category, speciality, encoumter, practitioner, patient_id) {
+    var _ref;
+
+    return _ref = {
       db_name: dbName,
       entity: "CAPatientClinicalDocs",
-      filter: "CAPatientClinicalDocs.activestatus ==true && CAPatientClinicalDocs.doccategory=='".concat(category, "' || CAPatientClinicalDocs.specialty=='").concat(speciality, "' || CAPatientClinicalDocs.encounterid=='").concat(encoumter, "' || CAPatientClinicalDocs.practitionerid=='").concat(practitioner, "'"),
-      return_fields: "MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:(for pract in Practitioner filter pract._id == CAPatientClinicalDocs.practitionerid return merge(pract,{name:(for doc in HumanNameMaster filter doc._id in pract.name return merge(doc,{use:(document(doc.use)),prefix:(document(doc.prefix)),suffix:(document(doc.suffix))})) ,practitioner_role:(FOR practrole IN TO_ARRAY(pract.practitioner_role) RETURN MERGE(DOCUMENT(practrole),{'role':MERGE(DOCUMENT(DOCUMENT(practrole).role),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(practrole).role).coding) RETURN DOCUMENT(cod) )}) }) ) }))},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})"
-    };
+      filter: "CAPatientClinicalDocs.activestatus ==true && CAPatientClinicalDocs.doccategory=='".concat(category, "' || CAPatientClinicalDocs.specialty=='").concat(speciality, "' || CAPatientClinicalDocs.encounterid=='").concat(encoumter, "' || CAPatientClinicalDocs.practitionerid=='").concat(practitioner, "'")
+    }, _defineProperty(_ref, "filter", "CAPatientClinicalDocs.patientid =='".concat(patient_id, "' && CAPatientClinicalDocs.activestatus ==true && (CAPatientClinicalDocs.doccategory=='").concat(category, "' || CAPatientClinicalDocs.specialty=='").concat(speciality, "' || CAPatientClinicalDocs.encounterid=='").concat(encoumter, "' || CAPatientClinicalDocs.practitionerid=='").concat(practitioner, "')")), _defineProperty(_ref, "return_fields", "MERGE(CAPatientClinicalDocs, {organizationid:document(CAPatientClinicalDocs.organizationid)},{doccategory:(document(CAPatientClinicalDocs.doccategory))}, {patientid:document(CAPatientClinicalDocs.patientid)},{practitionerid:(for pract in Practitioner filter pract._id == CAPatientClinicalDocs.practitionerid return merge(pract,{name:(for doc in HumanNameMaster filter doc._id in pract.name return merge(doc,{use:(document(doc.use)),prefix:(document(doc.prefix)),suffix:(document(doc.suffix))})) ,practitioner_role:(FOR practrole IN TO_ARRAY(pract.practitioner_role) RETURN MERGE(DOCUMENT(practrole),{'role':MERGE(DOCUMENT(DOCUMENT(practrole).role),{coding:(FOR cod IN TO_ARRAY(DOCUMENT(DOCUMENT(practrole).role).coding) RETURN DOCUMENT(cod) )}) }) ) }))},{encounterid:document(CAPatientClinicalDocs.encounterid),doctype:(document(CAPatientClinicalDocs.doctype)),reason:(document(CAPatientClinicalDocs.reason)),encountertype:(document(CAPatientClinicalDocs.encountertype)),specialty:(document(CAPatientClinicalDocs.specialty))})"), _ref;
   },
   //....not used....//
   doc_agnst_encounter: function doc_agnst_encounter(patient_id, encounter_id) {
@@ -39279,6 +39404,7 @@ var DOCC_READ = createAsyncThunk("DoccSlice/docc_read", /*#__PURE__*/_asyncToGen
       _ref14,
       rejectWithValue,
       getState,
+      patient_id,
       data,
       res,
       _args7 = arguments;
@@ -39290,31 +39416,32 @@ var DOCC_READ = createAsyncThunk("DoccSlice/docc_read", /*#__PURE__*/_asyncToGen
           payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
           _ref14 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref14.rejectWithValue, getState = _ref14.getState;
           _context7.prev = 2;
-          _context7.next = 5;
+          patient_id = payload.patient_id;
+          _context7.next = 6;
           return fetchData$3({
-            body: queries$2.doc_read
+            body: JSON.stringify(queries$2.doc_read(patient_id))
           }, __readDocumentUrl__);
 
-        case 5:
+        case 6:
           data = _context7.sent;
           res = generateResJson(data.result);
           return _context7.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: res
           }));
 
-        case 10:
-          _context7.prev = 10;
+        case 11:
+          _context7.prev = 11;
           _context7.t0 = _context7["catch"](2);
           return _context7.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context7.t0.message
           })));
 
-        case 13:
+        case 14:
         case "end":
           return _context7.stop();
       }
     }
-  }, _callee7, null, [[2, 10]]);
+  }, _callee7, null, [[2, 11]]);
 })));
 var DOCC_SINGLE_READ = createAsyncThunk("DoccSlice/docc_single_read", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
   var payload,
@@ -39373,6 +39500,7 @@ var DOCC_AGAINST_CATEGORY = createAsyncThunk("DoccSlice/docc_agnst_category", /*
       speciality,
       encoumter,
       practitioner,
+      patient_id,
       data,
       res,
       _args9 = arguments;
@@ -39384,10 +39512,10 @@ var DOCC_AGAINST_CATEGORY = createAsyncThunk("DoccSlice/docc_agnst_category", /*
           payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
           _ref18 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref18.rejectWithValue, getState = _ref18.getState;
           _context9.prev = 2;
-          category = payload.category, speciality = payload.speciality, encoumter = payload.encoumter, practitioner = payload.practitioner;
+          category = payload.category, speciality = payload.speciality, encoumter = payload.encoumter, practitioner = payload.practitioner, patient_id = payload.patient_id;
           _context9.next = 6;
           return fetchData$3({
-            body: JSON.stringify(queries$2.doc_agnst_category(category, speciality, encoumter, practitioner))
+            body: JSON.stringify(queries$2.doc_agnst_category(category, speciality, encoumter, practitioner, patient_id))
           }, __readDocumentUrl__);
 
         case 6:

package/package.json

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