primary_care_admin_binder 0.1.113 → 0.1.115

package/dist/index.cjs.js

@@ -13087,7 +13087,7 @@ var overRideTimeslot = function overRideTimeslot(data) {
   }
   return overRideTimeSlot;
 };
-var photoData = function photoData(data) {
+var photoData$1 = function photoData(data) {
   var photo_Data = [];
   if (data && data.length > 0) {
     data.map(function (val) {
@@ -13243,7 +13243,7 @@ var generateReadJSON$4 = function generateReadJSON(data, state) {
     overRideCard: overRideList(data.workingdayyearoverride),
     working_days_yes_no: ((_data$workingdayyear$4 = data.workingdayyear[0]) === null || _data$workingdayyear$4 === void 0 ? void 0 : (_data$workingdayyear$5 = _data$workingdayyear$4.workDaysOfWeek) === null || _data$workingdayyear$5 === void 0 ? void 0 : _data$workingdayyear$5.length) > 0 ? "No" : "Yes",
     is_visible: ((_data$workingdayyear$6 = data.workingdayyear[0]) === null || _data$workingdayyear$6 === void 0 ? void 0 : (_data$workingdayyear$7 = _data$workingdayyear$6.workDaysOfWeek) === null || _data$workingdayyear$7 === void 0 ? void 0 : _data$workingdayyear$7.length) > 0 ? true : false,
-    photo: photoData(data.photo),
+    photo: photoData$1(data.photo),
     returnAllowed: data.pharmacy && data.pharmacy.length > 0 && Array.isArray(data.pharmacy) ? data.pharmacy[0].returnAllowed : false,
     otcAllowed: data.pharmacy && data.pharmacy.length > 0 && Array.isArray(data.pharmacy) ? data.pharmacy[0].otcAllowed : false,
     externalRxAllowed: data.pharmacy && data.pharmacy.length > 0 && Array.isArray(data.pharmacy) ? data.pharmacy[0].exRxAllowed : false,
@@ -23238,13 +23238,6 @@ var masterQuery$5 = {
 };
 var orderTypedata = {
   ordertype: function ordertype(type) {
-    // return{
-    //   db_name: dbName,
-    //   entity: "OrderType",
-    //   filter: `OrderType.activestatus==true && OrderType.status==true && OrderType.ordercategory=='${type}'`,
-    //   return_fields: "merge(OrderType,{ordercategory:(document(OrderType.ordercategory))})",
-    //   sort: "OrderType.ordertype"
-    // }
     return {
       "db_name": dbName$1,
       "filter": {
@@ -23270,18 +23263,6 @@ var Query = {
   order_catalog_read: function order_catalog_read(_ref) {
     var page = _ref.page,
       perPage = _ref.perPage;
-    // return {
-    //   "db_name": dbName,
-    //   "entity": "OrderCatalog",
-    //   "sort": "OrderCatalog.createddate ASC",
-    //   "limit": {
-    //   "offset": page,
-    //   "count": perPage
-    //   },
-    //   "filter": "OrderCatalog.activestatus==true",
-    //   "return_fields": "MERGE(OrderCatalog,{TotalCount:COUNT(FOR cnt IN OrderCatalog RETURN cnt._key)},{ordercategory:(document(OrderCatalog.ordercategory)),ordertype:(document(OrderCatalog.ordertype)),healthcareservicecode:(document(OrderCatalog.healthcareservicecode)),OrderCatalogByEncounterTypeAge:(for doc in CA_OrderCatalogByEncounterTypeAge filter doc._id in OrderCatalog.OrderCatalogByEncounterTypeAge return doc),OrderAttribApplicability:(for doc in CA_OrderAttribApplicability filter doc._id in OrderCatalog.OrderAttribApplicability return doc),dfltFastingPeriodUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltFastingPeriodUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenBodySite:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenBodySite return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenCollectionMethod:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenCollectionMethod return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenType:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenType return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenVolumeUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenVolumeUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltqtyUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltqtyUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),maxorderqtyUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.maxorderqtyUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),repeatCheckUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.repeatCheckUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),AvailablebyPerOrganization:(for doc in to_array(OrderCatalog.AvailablebyPerOrganization) return merge(doc,{perforganizationId:(document(doc.perforganizationId)),perfOrganizationEntity:(for docs in CodeableConceptMaster filter docs._id==doc.perfOrganizationEntity return merge(doc,{coding:(for cod in CodingMaster filter cod._id in docs.coding return cod.display)}))})),dfltSpecimenContainer:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenContainer return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)}))})"
-    // };  
-
     return {
       "db_name": dbName$1,
       "filter": {
@@ -23295,20 +23276,8 @@ var Query = {
     var page = _ref2.page,
       perPage = _ref2.perPage,
       search = _ref2.search;
-    // return {
-    //   "db_name": dbName,
-    //   "entity": "OrderCatalog",
-    //   "sort": "OrderCatalog.createddate ASC",
-    //   "limit": {
-    //   "offset": page,
-    //   "count": perPage
-    //   },
-    //   "filter":  `(like(OrderCatalog.shortdesc,'%${search}%',true) || like(OrderCatalog.longdesc,'%${search}%',true) || like(OrderCatalog.ordercatalog,'%${search}%',true))  && OrderCatalog.activestatus==true`,
-    //   "return_fields": `MERGE(OrderCatalog,{TotalCount:COUNT(FOR cnt IN OrderCatalog FILTER (like(cnt.shortdesc,'%${search}%',true) || like(cnt.longdesc,'%${search}%',true) || like(cnt.ordercatalog,'%${search}%',true))  && cnt.activestatus==true RETURN cnt._key)},{ordercategory:(document(OrderCatalog.ordercategory)),ordertype:(document(OrderCatalog.ordertype)),healthcareservicecode:(document(OrderCatalog.healthcareservicecode)),OrderCatalogByEncounterTypeAge:(for doc in CA_OrderCatalogByEncounterTypeAge filter doc._id in OrderCatalog.OrderCatalogByEncounterTypeAge return doc),OrderAttribApplicability:(for doc in CA_OrderAttribApplicability filter doc._id in OrderCatalog.OrderAttribApplicability return doc),dfltFastingPeriodUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltFastingPeriodUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenBodySite:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenBodySite return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenCollectionMethod:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenCollectionMethod return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenType:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenType return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltSpecimenVolumeUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenVolumeUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),dfltqtyUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltqtyUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),maxorderqtyUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.maxorderqtyUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),repeatCheckUOM:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.repeatCheckUOM return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)})),AvailablebyPerOrganization:(for doc in to_array(OrderCatalog.AvailablebyPerOrganization) return merge(doc,{perforganizationId:(document(doc.perforganizationId)),perfOrganizationEntity:(for docs in CodeableConceptMaster filter docs._id==doc.perfOrganizationEntity return merge(doc,{coding:(for cod in CodingMaster filter cod._id in docs.coding return cod.display)}))})),dfltSpecimenContainer:(for doc in CodeableConceptMaster filter doc._id==OrderCatalog.dfltSpecimenContainer return merge(doc,{coding:(for cod in CodingMaster filter cod._id in doc.coding return cod.display)}))})`    
-    // }  
-
     return {
-      "db_name": "primarycareng",
+      "db_name": dbName$1,
       "filter": {
         "searchval": search,
         "page": page,
@@ -23318,13 +23287,6 @@ var Query = {
     };
   },
   editOrderCatalog: function editOrderCatalog(id) {
-    // return {
-    //   db_name: dbName,
-    //   entity: "OrderCatalog",
-    //   filter: `OrderCatalog.activestatus==true && OrderCatalog._id=='${id}'`,
-    //   return_fields:
-    //   "MERGE(OrderCatalog,{ordercategory:(document(OrderCatalog.ordercategory)),ordertype:(document(OrderCatalog.ordertype)),healthcareservicecode:(document(OrderCatalog.healthcareservicecode)),OrderCatalogByEncounterTypeAge:(for doc in CA_OrderCatalogByEncounterTypeAge filter doc._id in OrderCatalog.OrderCatalogByEncounterTypeAge return doc),OrderAttribApplicability:(for doc in CA_OrderAttribApplicability filter doc._id in OrderCatalog.OrderAttribApplicability return doc),dfltFastingPeriodUOM:document(OrderCatalog.dfltFastingPeriodUOM),dfltSpecimenBodySite:document(OrderCatalog.dfltSpecimenBodySite),dfltSpecimenCollectionMethod:document(OrderCatalog.dfltSpecimenCollectionMethod),dfltSpecimenType:document(OrderCatalog.dfltSpecimenType),dfltSpecimenVolumeUOM:document(OrderCatalog.dfltSpecimenVolumeUOM),dfltqtyUOM:document(OrderCatalog.dfltqtyUOM),maxorderqtyUOM:document(OrderCatalog.maxorderqtyUOM),repeatCheckUOM:document(OrderCatalog.repeatCheckUOM),AvailablebyPerOrganization:(for doc in to_array(OrderCatalog.AvailablebyPerOrganization) return merge(doc,{perforganizationId:(document(doc.perforganizationId)),perfOrganizationEntity:(document(doc.perfOrganizationEntity))})),dfltSpecimenContainer:document(OrderCatalog.dfltSpecimenContainer),repeatCheckAction:document(OrderCatalog.repeatCheckAction),resourcedefinition:(for i in TO_ARRAY(OrderCatalog.resourcedefinition) return {resourcetype:{label:document(i.resourcetype).display,value:document(i.resourcetype)._id,_id:document(i.resourcetype)._id},resourcerole:{label:document(i.resourcerole).display,value:document(i.resourcerole)._id,_id:document(i.resourcerole)._id},resourcename:(for resn in i.resourcename return {_id:document(resn)._id,value:document(resn)._id,label:CONCAT(document(document(resn).personid).name[0].fulname)}), resourcedepartment:(for resourcedepartment in i.resourcedepartment return {_id : document(resourcedepartment)._id,label:document(resourcedepartment).display,value : document(resourcedepartment)._id})}),observationdetails:(for obs in TO_ARRAY(OrderCatalog.observationdetails) return MERGE (obs,{vitalcode:{label:document(obs.vitalcode).longdesc,value:document(obs.vitalcode)._id,_id:document(obs.vitalcode)._id}}))})"
-    // };
     return {
       "db_name": dbName$1,
       "filter": {
@@ -23341,14 +23303,6 @@ var Query = {
     };
   },
   entityTypeName: function entityTypeName(name) {
-    // return {
-    //   db_name: dbName,
-    //   entity: "Organization",
-    //   sort: "Organization.name",
-    //   filter: `Organization.OrgType ANY =='${name}' && Organization.activestatus==true`,
-    //   return_fields: "Organization",
-    // };
-
     return {
       "db_name": dbName$1,
       "filter": {
@@ -23393,7 +23347,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$photo$, _data$photo$2, _data$photo$3, _data$photo$4, _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,
@@ -23435,6 +23389,15 @@ var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
       ordercatalog: data.code,
       shortdesc: data.shortdes,
       longdesc: data.longdes,
+      photo: data !== null && data !== void 0 && data.photo && (data === null || data === void 0 ? void 0 : data.photo.length) > 0 ? [{
+        date: "",
+        url: "",
+        id: 0,
+        fileName: data === null || data === void 0 ? void 0 : (_data$photo$ = data.photo[0]) === null || _data$photo$ === void 0 ? void 0 : _data$photo$.filename,
+        fileid: data === null || data === void 0 ? void 0 : (_data$photo$2 = data.photo[0]) === null || _data$photo$2 === void 0 ? void 0 : _data$photo$2.fileid,
+        filetype: data === null || data === void 0 ? void 0 : (_data$photo$3 = data.photo[0]) === null || _data$photo$3 === void 0 ? void 0 : _data$photo$3.filetype,
+        objectid: data === null || data === void 0 ? void 0 : (_data$photo$4 = data.photo[0]) === null || _data$photo$4 === void 0 ? void 0 : _data$photo$4.objectid
+      }] : [],
       catalogsynonym: data.catalogSynonym,
       mappingcodes: [{
         codesystem: "",
@@ -23452,8 +23415,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 +23445,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 +23495,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 +23576,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 +23605,6 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
   });
   return arr;
 };
-
 //for table response (readJSon)
 var generateResJson = function generateResJson(data) {
   var list = data.map(function (val) {
@@ -23602,8 +23635,27 @@ var generateUpdateJSON = function generateUpdateJSON(editID, Status) {
   }];
 };
 
+var photoData = function photoData(data) {
+  var photo_Data = [];
+  if (data && data.length > 0) {
+    data.map(function (val) {
+      var photo_data_obj = {
+        _id: val._id,
+        date: val.date,
+        url: val.url,
+        id: val.id,
+        fileName: val.fileName,
+        fileid: val.fileid,
+        filetype: val.filetype,
+        objectid: val.objectid
+      };
+      photo_Data.push(photo_data_obj);
+    });
+  }
+  return photo_Data;
+};
 var generateReadResJsonData = function generateReadResJsonData(val, state, resState) {
-  var _val$catalogsynonym2, _val$ordercategory2, _val$ordertype2, _val$healthcareservic2, _val$dfltqtyUOM2, _val$maxorderqtyUOM2, _val$repeatCheckUOM2, _val$repeatCheckActio2, _generateAttribute2, _val$dfltSpecimenType2, _val$dfltSpecimenVolu2, _val$dfltSpecimenBody2, _val$dfltFastingPerio2, _val$dfltSpecimenCont2, _val$dfltSpecimenColl2, _generateResoure2, _generateObservation2;
+  var _val$catalogsynonym2, _val$ordercategory2, _val$ordertype2, _val$healthcareservic2, _val$dfltqtyUOM2, _val$maxorderqtyUOM2, _photoData, _val$repeatCheckUOM2, _val$repeatCheckActio2, _generateAttribute2, _val$dfltSpecimenType2, _val$dfltSpecimenVolu2, _val$dfltSpecimenBody2, _val$dfltFastingPerio2, _val$dfltSpecimenCont2, _val$dfltSpecimenColl2, _generateResoure2, _generateObservation2;
   return {
     code: val.ordercatalog,
     longdes: val.longdesc,
@@ -23618,6 +23670,7 @@ var generateReadResJsonData = function generateReadResJsonData(val, state, resSt
     maxno: val.maxorderqty,
     Maxorder: val.maxorderqtyUOM && (_val$maxorderqtyUOM2 = val.maxorderqtyUOM) !== null && _val$maxorderqtyUOM2 !== void 0 && _val$maxorderqtyUOM2._id ? val.maxorderqtyUOM : null,
     explantorymsg: val.explanatorynote,
+    photo: (_photoData = photoData(val === null || val === void 0 ? void 0 : val.photo)) !== null && _photoData !== void 0 ? _photoData : [],
     characteristicJson: [{
       label: "Complete On Order",
       checked: val.completeonorder
@@ -23636,13 +23689,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 +23712,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 +23907,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 +23921,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.115",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",