primary_care_admin_binder 0.1.113 → 0.1.114

package/dist/index.cjs.js

@@ -23393,7 +23393,7 @@ var generateSaveChargeCode = function generateSaveChargeCode(data) {
   })];
 };
 var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
-  var _data$resourceList, _data$observationList, _data$characteristicJ, _data$itemdesc$value, _data$itemdesc, _data$DuplicatePeriod2, _data$CheckAction;
+  var _data$resourceList, _data$observationList, _data$DuplicatePeriod2, _data$CheckAction;
   var resourceresult = data === null || data === void 0 ? void 0 : (_data$resourceList = data.resourceList) === null || _data$resourceList === void 0 ? void 0 : _data$resourceList.map(function (item) {
     return {
       resourcetype: item.resourcetype._id,
@@ -23452,8 +23452,8 @@ var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
       chargeable: data.characteristicJson[3].checked,
       resultappl: data.characteristicJson[4].checked,
       resultauthreqd: data.characteristicJson[5].checked,
-      isitem: (_data$characteristicJ = data.characteristicJson[6]) === null || _data$characteristicJ === void 0 ? void 0 : _data$characteristicJ.checked,
-      itemdesc: (_data$itemdesc$value = data === null || data === void 0 ? void 0 : (_data$itemdesc = data.itemdesc) === null || _data$itemdesc === void 0 ? void 0 : _data$itemdesc.value) !== null && _data$itemdesc$value !== void 0 ? _data$itemdesc$value : "",
+      // isitem:data.characteristicJson[6]?.checked,
+      // itemdesc:data?.itemdesc?.value ?? "",
       explanatorynote: data.explantorymsg,
       // promptalertreqd: "boolean",
       // alertmessageCriteria: "string",
@@ -23482,21 +23482,29 @@ var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
       dfltSpecimenBodySite: data.BodyType ? data.BodyType.value : "",
       dfltFastingPeriod: data.FastingPeriodQuantity ? parseInt(data.FastingPeriodQuantity) : 0,
       dfltFastingPeriodUOM: data.FastingPeriod ? data.FastingPeriod.value : "",
-      OrderCatalogByEncounterTypeAge: getInstructionAndFrequency(data.instructions, data.frequency, data.Frequency_applicability),
+      // OrderCatalogByEncounterTypeAge: getInstructionAndFrequency(
+      //   data.instructions,
+      //   data.frequency,
+      //   data.Frequency_applicability
+      // ),
+
       draftstatus: data.draftstatus,
       OrderAttribApplicability: getAttributes(data.AttributeList, data.attribute),
       resourcedefinition: resourceresult !== null && resourceresult !== void 0 ? resourceresult : [],
-      observationdetails: observationresult !== null && observationresult !== void 0 ? observationresult : []
+      observationdetails: observationresult !== null && observationresult !== void 0 ? observationresult : [],
+      instruction: getInstruction(data.instructions),
+      frequency: getFrequency(data.frequency, data.Frequency_applicability)
     }
   })];
 };
 var getAvailability = function getAvailability(data) {
   var arr = data.map(function (v) {
-    var _v$entity_name$_id, _v$entity_name, _v$entity_name2, _v$appointment, _parseInt, _v$entity_type$_id, _v$entity_type;
+    var _v$entity_name$_id, _v$entity_name, _v$entity_name2, _v$appointment, _parseInt, _v$bill_nature$_id, _v$bill_nature, _v$entity_type$_id, _v$entity_type;
     return {
       perforganizationId: (_v$entity_name$_id = v === null || v === void 0 ? void 0 : (_v$entity_name = v.entity_name) === null || _v$entity_name === void 0 ? void 0 : _v$entity_name._id) !== null && _v$entity_name$_id !== void 0 ? _v$entity_name$_id : v === null || v === void 0 ? void 0 : (_v$entity_name2 = v.entity_name) === null || _v$entity_name2 === void 0 ? void 0 : _v$entity_name2.value,
       apptreqd: (_v$appointment = v === null || v === void 0 ? void 0 : v.appointment) !== null && _v$appointment !== void 0 ? _v$appointment : false,
       apptDurnInMinutes: (_parseInt = parseInt(v.duration)) !== null && _parseInt !== void 0 ? _parseInt : null,
+      billnature: (_v$bill_nature$_id = v === null || v === void 0 ? void 0 : (_v$bill_nature = v.bill_nature) === null || _v$bill_nature === void 0 ? void 0 : _v$bill_nature._id) !== null && _v$bill_nature$_id !== void 0 ? _v$bill_nature$_id : null,
       perfOrganizationEntity: (_v$entity_type$_id = v === null || v === void 0 ? void 0 : (_v$entity_type = v.entity_type) === null || _v$entity_type === void 0 ? void 0 : _v$entity_type._id) !== null && _v$entity_type$_id !== void 0 ? _v$entity_type$_id : null,
       EffFrDate: v !== null && v !== void 0 && v.effective_from ? getUtcTime(moment(v.effective_from, "DD/MM/YYYY")) : null,
       EffToDate: v !== null && v !== void 0 && v.effective_to ? getUtcTime(moment(v === null || v === void 0 ? void 0 : v.effective_to, "DD/MM/YYYY")) : null
@@ -23524,7 +23532,66 @@ var getAttributes = function getAttributes(data, attri) {
   });
   return arr;
 };
-var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fredata, freapp) {
+
+// const getInstructionAndFrequency = (insdata, fredata, freapp) => {
+//   let arr = [];
+
+//   insdata.map((v, i) => {
+//     arr.push({
+//       _id: v._id,
+//       id: 0,
+//       serviceapplicability: "Service",
+//       setuptypeInd: "Instruction",
+
+//       encountertype: v.encounterType ? v.encounterType._id : "",
+//       gendercode: v.gender ? v.gender._id : "",
+//       agegroup: v.ageRange ? v.ageRange.value : "",
+//       agecatgcode: v.agecategory
+//         ? v.agecategory.map((a) => {
+//             return a.value;
+//           })
+//         : [],
+
+//       OrderInstr: [
+//         {
+//           patientInst: v.patientInstrction,
+//           practionerInst: v.practitionerInstrction,
+//           prepInstr: v.prepratoryInstrction,
+//           deptInstr: v.departmentInstrction,
+//         },
+//       ],
+//     });
+//   });
+
+//   fredata.map((v) => {
+//     arr.push({
+//       _id: v._id,
+//       id: 0,
+//       serviceapplicability: "Service",
+//       setuptypeInd: "DefaultValues",
+//       ordercatalog: "string",
+//       encountertype: v.encounterType ? v.encounterType._id : "",
+//       gendercode: v.gender ? v.gender._id : "",
+//       agegroup: v.ageRange ? v.ageRange.value : "",
+//       agecatgcode: v.agecategory
+//         ? v.agecategory.map((a) => {
+//             return a.value;
+//           })
+//         : [],
+//       freqappl: freapp,
+//       dfltfreqValue: v.freqvalue ? parseInt(v.freqvalue) : 0,
+//       dfltfreqValueUnit: v.freqValSelect ? v.freqValSelect._id : "",
+//       dfltfreqRate: v.freqrate ? parseInt(v.freqrate) : 0,
+//       dfltfreqRateUnit: v.freqRatSelect ? v.freqRatSelect._id : "",
+//       dfltduration: v.freqdura ? parseInt(v.freqdura) : 0,
+//       dfltdurationType: v.freqDuraSelect ? v.freqDuraSelect._id : "",
+//       maxdurnallowedinDays: v.freqmax ? parseInt(v.freqmax) : 0,
+//     });
+//   });
+
+//   return arr;
+// };
+var getInstruction = function getInstruction(insdata) {
   var arr = [];
   insdata.map(function (v, i) {
     arr.push({
@@ -23546,6 +23613,10 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
       }]
     });
   });
+  return arr;
+};
+var getFrequency = function getFrequency(fredata, freapp) {
+  var arr = [];
   fredata.map(function (v) {
     arr.push({
       _id: v._id,
@@ -23571,7 +23642,6 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
   });
   return arr;
 };
-
 //for table response (readJSon)
 var generateResJson = function generateResJson(data) {
   var list = data.map(function (val) {
@@ -23636,13 +23706,12 @@ var generateReadResJsonData = function generateReadResJsonData(val, state, resSt
     }, {
       label: "Result Authentication Required",
       checked: val.resultauthreqd
-    }, {
-      label: "Item/Services",
-      checked: val.isitem
     }],
-    itemdesc: val.itemdesc ? state.order_catalog_serviceItem.data.find(function (sys) {
-      return val.itemdesc.indexOf(sys.value) > -1;
-    }) : null,
+    // itemdesc:(val.itemdesc)
+    // ? state.order_catalog_serviceItem.data.find(
+    //     (sys) => val.itemdesc.indexOf(sys.value) > -1
+    //   )
+    // : null,
     checkSwitch: val.checkforrepeatorders,
     no: val.repeatcheckperiod,
     DuplicatePeriod: val.repeatCheckUOM && (_val$repeatCheckUOM2 = val.repeatCheckUOM) !== null && _val$repeatCheckUOM2 !== void 0 && _val$repeatCheckUOM2._id ? val.repeatCheckUOM : null,
@@ -23660,9 +23729,9 @@ var generateReadResJsonData = function generateReadResJsonData(val, state, resSt
     FastingPeriod: val.dfltFastingPeriodUOM && (_val$dfltFastingPerio2 = val.dfltFastingPeriodUOM) !== null && _val$dfltFastingPerio2 !== void 0 && _val$dfltFastingPerio2._id ? val.dfltFastingPeriodUOM : null,
     SpecimenContainer: val.dfltSpecimenContainer && (_val$dfltSpecimenCont2 = val.dfltSpecimenContainer) !== null && _val$dfltSpecimenCont2 !== void 0 && _val$dfltSpecimenCont2._id ? val.dfltSpecimenContainer : null,
     CollectionMethod: val.dfltSpecimenCollectionMethod && (_val$dfltSpecimenColl2 = val.dfltSpecimenCollectionMethod) !== null && _val$dfltSpecimenColl2 !== void 0 && _val$dfltSpecimenColl2._id ? val.dfltSpecimenCollectionMethod : null,
-    instructions: generateInstruction(val.OrderCatalogByEncounterTypeAge),
-    Frequency_applicability: generateFrequency(val.OrderCatalogByEncounterTypeAge).length > 0 ? true : false,
-    frequency: generateFrequency(val.OrderCatalogByEncounterTypeAge),
+    instructions: generateInstruction(val.instruction),
+    Frequency_applicability: generateFrequency(val.frequency).length > 0 ? true : false,
+    frequency: generateFrequency(val.frequency),
     editData: val._key,
     id: val.id,
     draftstatus: val.draftstatus,
@@ -23855,7 +23924,7 @@ var generateFrequency = function generateFrequency(data, state) {
 };
 var generatefaciltity = function generatefaciltity(data, state) {
   var facilityArr = data.map(function (v) {
-    var _v$apptreqd, _v$apptDurnInMinutes;
+    var _v$apptreqd, _v$apptDurnInMinutes, _v$billnature;
     return {
       entity_type: v.perfOrganizationEntity && v.perfOrganizationEntity._id ? v.perfOrganizationEntity : null,
       // entity_name: v.perforganizationId
@@ -23869,8 +23938,9 @@ var generatefaciltity = function generatefaciltity(data, state) {
       } : null,
       appointment: (_v$apptreqd = v === null || v === void 0 ? void 0 : v.apptreqd) !== null && _v$apptreqd !== void 0 ? _v$apptreqd : false,
       duration: (_v$apptDurnInMinutes = v === null || v === void 0 ? void 0 : v.apptDurnInMinutes) !== null && _v$apptDurnInMinutes !== void 0 ? _v$apptDurnInMinutes : "",
-      effective_from: v !== null && v !== void 0 && v.EffFrDate ? new Date(utcTOLocal(v.EffFrDate)).toLocaleDateString() : "",
-      effective_to: v !== null && v !== void 0 && v.EffToDate ? new Date(utcTOLocal(v.EffToDate)).toLocaleDateString() : ""
+      bill_nature: (_v$billnature = v === null || v === void 0 ? void 0 : v.billnature) !== null && _v$billnature !== void 0 ? _v$billnature : "",
+      effective_from: v !== null && v !== void 0 && v.EffFrDate ? new Date(utcTOLocal(v.EffFrDate)).toLocaleDateString('en-GB') : "",
+      effective_to: v !== null && v !== void 0 && v.EffToDate ? new Date(utcTOLocal(v.EffToDate)).toLocaleDateString('en-GB') : ""
     };
   });
   return facilityArr;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "primary_care_admin_binder",
-  "version": "0.1.113",
+  "version": "0.1.114",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",