primary_care_admin_binder 0.1.143 → 0.1.146

package/dist/index.cjs.js

@@ -25535,7 +25535,7 @@ var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
   })];
 };
 var getAvailability = function getAvailability(data) {
-  var arr = data.map(function (v) {
+  var arr = (data !== null && data !== void 0 ? data : []).map(function (v) {
     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 || (_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 || (_v$entity_name2 = v.entity_name) === null || _v$entity_name2 === void 0 ? void 0 : _v$entity_name2.value,
@@ -25550,7 +25550,7 @@ var getAvailability = function getAvailability(data) {
   return arr;
 };
 var getAttributes = function getAttributes(data, attri) {
-  var arr = data.map(function (v, i) {
+  var arr = (data !== null && data !== void 0 ? data : []).map(function (v, i) {
     var _v$isMandatory;
     return {
       _id: v._id,
@@ -25573,7 +25573,7 @@ var getAttributes = function getAttributes(data, attri) {
 // const getInstructionAndFrequency = (insdata, fredata, freapp) => {
 //   let arr = [];
 
-//   insdata.map((v, i) => {
+//   ins(data ?? []).map((v, i) => {
 //     arr.push({
 //       _id: v._id,
 //       id: 0,
@@ -25600,7 +25600,7 @@ var getAttributes = function getAttributes(data, attri) {
 //     });
 //   });
 
-//   fredata.map((v) => {
+//   fre(data ?? []).map((v) => {
 //     arr.push({
 //       _id: v._id,
 //       id: 0,
@@ -25628,60 +25628,126 @@ var getAttributes = function getAttributes(data, attri) {
 
 //   return arr;
 // };
-var getInstruction = function getInstruction(insdata) {
+// const getInstruction = (insdata) => {
+//   let arr = [];
+//   ins(data ?? []).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,
+//         },
+//       ],
+//     });
+//   });
+//   return arr;
+// };
+
+var getInstruction = function getInstruction() {
+  var insdata = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var arr = [];
-  insdata.map(function (v, i) {
+  (insdata !== null && insdata !== void 0 ? insdata : []).forEach(function (v) {
+    var _v$encounterType$_id, _v$encounterType, _v$gender$_id, _v$gender, _v$ageRange$value, _v$ageRange, _v$agecategory, _v$patientInstrction, _v$practitionerInstrc, _v$prepratoryInstrcti, _v$departmentInstrcti;
     arr.push({
-      _id: v._id,
+      _id: v === null || v === void 0 ? void 0 : 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(function (a) {
-        return a.value;
-      }) : [],
+      encountertype: (_v$encounterType$_id = v === null || v === void 0 || (_v$encounterType = v.encounterType) === null || _v$encounterType === void 0 ? void 0 : _v$encounterType._id) !== null && _v$encounterType$_id !== void 0 ? _v$encounterType$_id : "",
+      gendercode: (_v$gender$_id = v === null || v === void 0 || (_v$gender = v.gender) === null || _v$gender === void 0 ? void 0 : _v$gender._id) !== null && _v$gender$_id !== void 0 ? _v$gender$_id : "",
+      agegroup: (_v$ageRange$value = v === null || v === void 0 || (_v$ageRange = v.ageRange) === null || _v$ageRange === void 0 ? void 0 : _v$ageRange.value) !== null && _v$ageRange$value !== void 0 ? _v$ageRange$value : "",
+      agecatgcode: ((_v$agecategory = v === null || v === void 0 ? void 0 : v.agecategory) !== null && _v$agecategory !== void 0 ? _v$agecategory : []).map(function (a) {
+        return a === null || a === void 0 ? void 0 : a.value;
+      }),
       OrderInstr: [{
-        patientInst: v.patientInstrction,
-        practionerInst: v.practitionerInstrction,
-        prepInstr: v.prepratoryInstrction,
-        deptInstr: v.departmentInstrction
+        patientInst: (_v$patientInstrction = v === null || v === void 0 ? void 0 : v.patientInstrction) !== null && _v$patientInstrction !== void 0 ? _v$patientInstrction : "",
+        practionerInst: (_v$practitionerInstrc = v === null || v === void 0 ? void 0 : v.practitionerInstrction) !== null && _v$practitionerInstrc !== void 0 ? _v$practitionerInstrc : "",
+        prepInstr: (_v$prepratoryInstrcti = v === null || v === void 0 ? void 0 : v.prepratoryInstrction) !== null && _v$prepratoryInstrcti !== void 0 ? _v$prepratoryInstrcti : "",
+        deptInstr: (_v$departmentInstrcti = v === null || v === void 0 ? void 0 : v.departmentInstrction) !== null && _v$departmentInstrcti !== void 0 ? _v$departmentInstrcti : ""
       }]
     });
   });
   return arr;
 };
-var getFrequency = function getFrequency(fredata, freapp) {
+
+// const getFrequency = (fredata, freapp) => {
+//   let arr = [];
+//   fre(data ?? []).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;
+// };
+//for table response (readJSon)
+
+var getFrequency = function getFrequency() {
+  var fredata = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var freapp = arguments.length > 1 ? arguments[1] : undefined;
   var arr = [];
-  fredata.map(function (v) {
+  (fredata !== null && fredata !== void 0 ? fredata : []).forEach(function (v) {
+    var _v$encounterType$_id2, _v$encounterType2, _v$gender$_id2, _v$gender2, _v$ageRange$value2, _v$ageRange2, _v$agecategory2, _v$freqValSelect$_id, _v$freqValSelect, _v$freqRatSelect$_id, _v$freqRatSelect, _v$freqDuraSelect$_id, _v$freqDuraSelect;
     arr.push({
-      _id: v._id,
+      _id: v === null || v === void 0 ? void 0 : 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(function (a) {
-        return a.value;
-      }) : [],
+      encountertype: (_v$encounterType$_id2 = v === null || v === void 0 || (_v$encounterType2 = v.encounterType) === null || _v$encounterType2 === void 0 ? void 0 : _v$encounterType2._id) !== null && _v$encounterType$_id2 !== void 0 ? _v$encounterType$_id2 : "",
+      gendercode: (_v$gender$_id2 = v === null || v === void 0 || (_v$gender2 = v.gender) === null || _v$gender2 === void 0 ? void 0 : _v$gender2._id) !== null && _v$gender$_id2 !== void 0 ? _v$gender$_id2 : "",
+      agegroup: (_v$ageRange$value2 = v === null || v === void 0 || (_v$ageRange2 = v.ageRange) === null || _v$ageRange2 === void 0 ? void 0 : _v$ageRange2.value) !== null && _v$ageRange$value2 !== void 0 ? _v$ageRange$value2 : "",
+      agecatgcode: ((_v$agecategory2 = v === null || v === void 0 ? void 0 : v.agecategory) !== null && _v$agecategory2 !== void 0 ? _v$agecategory2 : []).map(function (a) {
+        return a === null || a === void 0 ? void 0 : 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
+      dfltfreqValue: v !== null && v !== void 0 && v.freqvalue ? parseInt(v.freqvalue) : 0,
+      dfltfreqValueUnit: (_v$freqValSelect$_id = v === null || v === void 0 || (_v$freqValSelect = v.freqValSelect) === null || _v$freqValSelect === void 0 ? void 0 : _v$freqValSelect._id) !== null && _v$freqValSelect$_id !== void 0 ? _v$freqValSelect$_id : "",
+      dfltfreqRate: v !== null && v !== void 0 && v.freqrate ? parseInt(v.freqrate) : 0,
+      dfltfreqRateUnit: (_v$freqRatSelect$_id = v === null || v === void 0 || (_v$freqRatSelect = v.freqRatSelect) === null || _v$freqRatSelect === void 0 ? void 0 : _v$freqRatSelect._id) !== null && _v$freqRatSelect$_id !== void 0 ? _v$freqRatSelect$_id : "",
+      dfltduration: v !== null && v !== void 0 && v.freqdura ? parseInt(v.freqdura) : 0,
+      dfltdurationType: (_v$freqDuraSelect$_id = v === null || v === void 0 || (_v$freqDuraSelect = v.freqDuraSelect) === null || _v$freqDuraSelect === void 0 ? void 0 : _v$freqDuraSelect._id) !== null && _v$freqDuraSelect$_id !== void 0 ? _v$freqDuraSelect$_id : "",
+      maxdurnallowedinDays: v !== null && v !== void 0 && v.freqmax ? parseInt(v.freqmax) : 0
     });
   });
   return arr;
 };
-//for table response (readJSon)
 var generateResJson = function generateResJson(data) {
-  var list = data.map(function (val) {
+  var list = (data !== null && data !== void 0 ? data : []).map(function (val) {
     return _objectSpread2({
       code: val.ordercatalog ? val.ordercatalog : "",
       "short": val.shortdesc ? val.shortdesc : "",
@@ -25711,7 +25777,7 @@ var generateUpdateJSON = function generateUpdateJSON(editID, Status) {
 var photoData = function photoData(data) {
   var photo_Data = [];
   if (data && data.length > 0) {
-    data.map(function (val) {
+    (data !== null && data !== void 0 ? data : []).map(function (val) {
       var photo_data_obj = {
         _id: val._id,
         date: val.date,
@@ -25727,21 +25793,128 @@ var photoData = function photoData(data) {
   }
   return photo_Data;
 };
+
+// export const generateReadResJsonData = (val, state,resState) => {
+//   return {
+//     code: val?.ordercatalog,
+//     longdes: val?.longdesc,
+//     shortdes: val?.shortdesc,
+//     catalogSynonym: val?.catalogsynonym ?? "",
+//     orderCategory: (val?.ordercategory && val?.ordercategory?._id) ? val?.ordercategory : null,
+//     orderType: (val?.ordertype && val?.ordertype?._id) ? val?.ordertype : null,
+//     healthcareService: (val?.healthcareservicecode && val?.healthcareservicecode?._id) ? val?.healthcareservicecode : null,
+//     Qtyno: val?.dfltqty,
+//     DefaultQuantity:
+//      ( val?.dfltqtyUOM && val?.dfltqtyUOM?._id)
+//         ? val.dfltqtyUOM
+//         : null,
+//     AllowQtyCheck: val?.allowqtychange,
+//     maxno: val?.maxorderqty,
+//     Maxorder:
+//       (val?.maxorderqtyUOM && val?.maxorderqtyUOM?._id) ? val?.maxorderqtyUOM : null,
+//     explantorymsg: val?.explanatorynote,
+//     photo: photoData(val?.photo) ?? [],
+//     characteristicJson: [
+//       {
+//         label: "Complete On Order",
+//         checked: val?.completeonorder,
+//       },
+//       {
+//         label: "Hold Applicable",
+//         checked: val?.holdappl,
+//       },
+//       {
+//         label: "Discontinue Applicable",
+//         checked: val?.discontinuappl,
+//       },
+//       {
+//         label: "Chargeable",
+//         checked: val?.chargeable,
+//       },
+//       {
+//         label: "Result Applicable",
+//         checked: val?.resultappl,
+//       },
+//       {
+//         label: "Result Authentication Required",
+//         checked: val?.resultauthreqd,
+//       },
+//     ],
+//     // 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?.repeatCheckUOM?._id) ? val?.repeatCheckUOM : null,
+//     CheckAction: (val?.repeatCheckAction && val?.repeatCheckAction?._id) ? val?.repeatCheckAction : null,
+//     consentSwitch: val?.consentreqd,
+//     ConsentForm: null,
+//     attribute:
+//       val?.OrderAttribApplicability.length > 0
+//         ? val?.OrderAttribApplicability[0].winlabelName
+//         : "",
+//     AttributeList: generateAttribute(val?.OrderAttribApplicability, state) ?? [],
+//     FacilityData: generatefaciltity(val?.AvailablebyPerOrganization),
+//     SpecimenType: (val?.dfltSpecimenType && val?.dfltSpecimenType?._id)
+//       ? val?.dfltSpecimenType : null,
+//     VolumeQuantity: val?.dfltSpecimenVolume,
+//     Volume:
+//       (val?.dfltSpecimenVolumeUOM && val?.dfltSpecimenVolumeUOM?._id)
+//         ? val?.dfltSpecimenVolumeUOM : null,
+//     BodyType:
+//       (val?.dfltSpecimenBodySite && val?.dfltSpecimenBodySite?._id)
+//         ? val?.dfltSpecimenBodySite : null,
+//     FastingPeriodQuantity: val?.dfltFastingPeriod,
+//     FastingPeriod:
+//       (val?.dfltFastingPeriodUOM && val?.dfltFastingPeriodUOM?._id)
+//       ? val?.dfltFastingPeriodUOM
+//         : null,
+//     SpecimenContainer:
+//       (val?.dfltSpecimenContainer && val?.dfltSpecimenContainer?._id)
+//         ? val?.dfltSpecimenContainer
+//         : null,
+//     CollectionMethod:
+//       (val?.dfltSpecimenCollectionMethod && val?.dfltSpecimenCollectionMethod?._id)
+//         ? val?.dfltSpecimenCollectionMethod
+//         : null,
+//     instructions: generateInstruction(
+//       val?.instruction,
+//       state
+//     ),
+//     Frequency_applicability:
+//       generateFrequency(val?.frequency, state).length > 0
+//         ? true
+//         : false,
+//     frequency: generateFrequency(val?.frequency, state),
+//     editData: val?._key,
+//     id: val?.id,
+//     draftstatus: val?.draftstatus,
+//     status: val?.status,
+//     resourceList: generateResoure(val?.resourcedefinition
+//       ,resState) ?? [],
+//     observationList: generateObservation(val?.observationdetails) ?? [],
+//     // observationList: val.observationdetails
+//   };
+// };
+
 var generateReadResJsonData = function generateReadResJsonData(val, state, resState) {
-  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;
+  var _val$catalogsynonym2, _val$ordercategory2, _val$ordertype2, _val$healthcareservic2, _val$dfltqtyUOM2, _val$maxorderqtyUOM2, _photoData, _val$repeatCheckUOM2, _val$repeatCheckActio2, _val$OrderAttribAppli, _val$OrderAttribAppli2, _val$OrderAttribAppli3, _val$dfltSpecimenType2, _val$dfltSpecimenVolu2, _val$dfltSpecimenBody2, _val$dfltFastingPerio2, _val$dfltSpecimenCont2, _val$dfltSpecimenColl2, _generateResoure2, _generateObservation2;
+  var frequencyData = generateFrequency(val === null || val === void 0 ? void 0 : val.frequency, state);
   return {
     code: val === null || val === void 0 ? void 0 : val.ordercatalog,
     longdes: val === null || val === void 0 ? void 0 : val.longdesc,
     shortdes: val === null || val === void 0 ? void 0 : val.shortdesc,
     catalogSynonym: (_val$catalogsynonym2 = val === null || val === void 0 ? void 0 : val.catalogsynonym) !== null && _val$catalogsynonym2 !== void 0 ? _val$catalogsynonym2 : "",
-    orderCategory: val !== null && val !== void 0 && val.ordercategory && val !== null && val !== void 0 && (_val$ordercategory2 = val.ordercategory) !== null && _val$ordercategory2 !== void 0 && _val$ordercategory2._id ? val === null || val === void 0 ? void 0 : val.ordercategory : null,
-    orderType: val !== null && val !== void 0 && val.ordertype && val !== null && val !== void 0 && (_val$ordertype2 = val.ordertype) !== null && _val$ordertype2 !== void 0 && _val$ordertype2._id ? val === null || val === void 0 ? void 0 : val.ordertype : null,
-    healthcareService: val !== null && val !== void 0 && val.healthcareservicecode && val !== null && val !== void 0 && (_val$healthcareservic2 = val.healthcareservicecode) !== null && _val$healthcareservic2 !== void 0 && _val$healthcareservic2._id ? val === null || val === void 0 ? void 0 : val.healthcareservicecode : null,
+    orderCategory: val !== null && val !== void 0 && (_val$ordercategory2 = val.ordercategory) !== null && _val$ordercategory2 !== void 0 && _val$ordercategory2._id ? val.ordercategory : null,
+    orderType: val !== null && val !== void 0 && (_val$ordertype2 = val.ordertype) !== null && _val$ordertype2 !== void 0 && _val$ordertype2._id ? val.ordertype : null,
+    healthcareService: val !== null && val !== void 0 && (_val$healthcareservic2 = val.healthcareservicecode) !== null && _val$healthcareservic2 !== void 0 && _val$healthcareservic2._id ? val.healthcareservicecode : null,
     Qtyno: val === null || val === void 0 ? void 0 : val.dfltqty,
-    DefaultQuantity: val !== null && val !== void 0 && val.dfltqtyUOM && val !== null && val !== void 0 && (_val$dfltqtyUOM2 = val.dfltqtyUOM) !== null && _val$dfltqtyUOM2 !== void 0 && _val$dfltqtyUOM2._id ? val.dfltqtyUOM : null,
+    DefaultQuantity: val !== null && val !== void 0 && (_val$dfltqtyUOM2 = val.dfltqtyUOM) !== null && _val$dfltqtyUOM2 !== void 0 && _val$dfltqtyUOM2._id ? val.dfltqtyUOM : null,
     AllowQtyCheck: val === null || val === void 0 ? void 0 : val.allowqtychange,
     maxno: val === null || val === void 0 ? void 0 : val.maxorderqty,
-    Maxorder: val !== null && val !== void 0 && val.maxorderqtyUOM && val !== null && val !== void 0 && (_val$maxorderqtyUOM2 = val.maxorderqtyUOM) !== null && _val$maxorderqtyUOM2 !== void 0 && _val$maxorderqtyUOM2._id ? val === null || val === void 0 ? void 0 : val.maxorderqtyUOM : null,
+    Maxorder: val !== null && val !== void 0 && (_val$maxorderqtyUOM2 = val.maxorderqtyUOM) !== null && _val$maxorderqtyUOM2 !== void 0 && _val$maxorderqtyUOM2._id ? val.maxorderqtyUOM : null,
     explantorymsg: val === null || val === void 0 ? void 0 : val.explanatorynote,
     photo: (_photoData = photoData(val === null || val === void 0 ? void 0 : val.photo)) !== null && _photoData !== void 0 ? _photoData : [],
     characteristicJson: [{
@@ -25763,71 +25936,130 @@ var generateReadResJsonData = function generateReadResJsonData(val, state, resSt
       label: "Result Authentication Required",
       checked: val === null || val === void 0 ? void 0 : val.resultauthreqd
     }],
-    // itemdesc:(val.itemdesc)
-    // ? state.order_catalog_serviceItem.data.find(
-    //     (sys) => val.itemdesc.indexOf(sys.value) > -1
-    //   )
-    // : null,
     checkSwitch: val === null || val === void 0 ? void 0 : val.checkforrepeatorders,
     no: val === null || val === void 0 ? void 0 : val.repeatcheckperiod,
-    DuplicatePeriod: val !== null && val !== void 0 && val.repeatCheckUOM && val !== null && val !== void 0 && (_val$repeatCheckUOM2 = val.repeatCheckUOM) !== null && _val$repeatCheckUOM2 !== void 0 && _val$repeatCheckUOM2._id ? val === null || val === void 0 ? void 0 : val.repeatCheckUOM : null,
-    CheckAction: val !== null && val !== void 0 && val.repeatCheckAction && val !== null && val !== void 0 && (_val$repeatCheckActio2 = val.repeatCheckAction) !== null && _val$repeatCheckActio2 !== void 0 && _val$repeatCheckActio2._id ? val === null || val === void 0 ? void 0 : val.repeatCheckAction : null,
+    DuplicatePeriod: val !== null && val !== void 0 && (_val$repeatCheckUOM2 = val.repeatCheckUOM) !== null && _val$repeatCheckUOM2 !== void 0 && _val$repeatCheckUOM2._id ? val.repeatCheckUOM : null,
+    CheckAction: val !== null && val !== void 0 && (_val$repeatCheckActio2 = val.repeatCheckAction) !== null && _val$repeatCheckActio2 !== void 0 && _val$repeatCheckActio2._id ? val.repeatCheckAction : null,
     consentSwitch: val === null || val === void 0 ? void 0 : val.consentreqd,
     ConsentForm: null,
-    attribute: (val === null || val === void 0 ? void 0 : val.OrderAttribApplicability.length) > 0 ? val === null || val === void 0 ? void 0 : val.OrderAttribApplicability[0].winlabelName : "",
-    AttributeList: (_generateAttribute2 = generateAttribute(val === null || val === void 0 ? void 0 : val.OrderAttribApplicability, state)) !== null && _generateAttribute2 !== void 0 ? _generateAttribute2 : [],
+    attribute: (val === null || val === void 0 || (_val$OrderAttribAppli = val.OrderAttribApplicability) === null || _val$OrderAttribAppli === void 0 ? void 0 : _val$OrderAttribAppli.length) > 0 ? val === null || val === void 0 || (_val$OrderAttribAppli2 = val.OrderAttribApplicability[0]) === null || _val$OrderAttribAppli2 === void 0 ? void 0 : _val$OrderAttribAppli2.winlabelName : "",
+    AttributeList: generateAttribute((_val$OrderAttribAppli3 = val === null || val === void 0 ? void 0 : val.OrderAttribApplicability) !== null && _val$OrderAttribAppli3 !== void 0 ? _val$OrderAttribAppli3 : [], state),
     FacilityData: generatefaciltity(val === null || val === void 0 ? void 0 : val.AvailablebyPerOrganization),
-    SpecimenType: val !== null && val !== void 0 && val.dfltSpecimenType && val !== null && val !== void 0 && (_val$dfltSpecimenType2 = val.dfltSpecimenType) !== null && _val$dfltSpecimenType2 !== void 0 && _val$dfltSpecimenType2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenType : null,
+    SpecimenType: val !== null && val !== void 0 && (_val$dfltSpecimenType2 = val.dfltSpecimenType) !== null && _val$dfltSpecimenType2 !== void 0 && _val$dfltSpecimenType2._id ? val.dfltSpecimenType : null,
     VolumeQuantity: val === null || val === void 0 ? void 0 : val.dfltSpecimenVolume,
-    Volume: val !== null && val !== void 0 && val.dfltSpecimenVolumeUOM && val !== null && val !== void 0 && (_val$dfltSpecimenVolu2 = val.dfltSpecimenVolumeUOM) !== null && _val$dfltSpecimenVolu2 !== void 0 && _val$dfltSpecimenVolu2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenVolumeUOM : null,
-    BodyType: val !== null && val !== void 0 && val.dfltSpecimenBodySite && val !== null && val !== void 0 && (_val$dfltSpecimenBody2 = val.dfltSpecimenBodySite) !== null && _val$dfltSpecimenBody2 !== void 0 && _val$dfltSpecimenBody2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenBodySite : null,
+    Volume: val !== null && val !== void 0 && (_val$dfltSpecimenVolu2 = val.dfltSpecimenVolumeUOM) !== null && _val$dfltSpecimenVolu2 !== void 0 && _val$dfltSpecimenVolu2._id ? val.dfltSpecimenVolumeUOM : null,
+    BodyType: val !== null && val !== void 0 && (_val$dfltSpecimenBody2 = val.dfltSpecimenBodySite) !== null && _val$dfltSpecimenBody2 !== void 0 && _val$dfltSpecimenBody2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenBodySite : null,
     FastingPeriodQuantity: val === null || val === void 0 ? void 0 : val.dfltFastingPeriod,
-    FastingPeriod: val !== null && val !== void 0 && val.dfltFastingPeriodUOM && val !== null && val !== void 0 && (_val$dfltFastingPerio2 = val.dfltFastingPeriodUOM) !== null && _val$dfltFastingPerio2 !== void 0 && _val$dfltFastingPerio2._id ? val === null || val === void 0 ? void 0 : val.dfltFastingPeriodUOM : null,
-    SpecimenContainer: val !== null && val !== void 0 && val.dfltSpecimenContainer && val !== null && val !== void 0 && (_val$dfltSpecimenCont2 = val.dfltSpecimenContainer) !== null && _val$dfltSpecimenCont2 !== void 0 && _val$dfltSpecimenCont2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenContainer : null,
-    CollectionMethod: val !== null && val !== void 0 && val.dfltSpecimenCollectionMethod && val !== null && val !== void 0 && (_val$dfltSpecimenColl2 = val.dfltSpecimenCollectionMethod) !== null && _val$dfltSpecimenColl2 !== void 0 && _val$dfltSpecimenColl2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenCollectionMethod : null,
-    instructions: generateInstruction(val === null || val === void 0 ? void 0 : val.instruction),
-    Frequency_applicability: generateFrequency(val === null || val === void 0 ? void 0 : val.frequency).length > 0 ? true : false,
-    frequency: generateFrequency(val === null || val === void 0 ? void 0 : val.frequency),
+    FastingPeriod: val !== null && val !== void 0 && (_val$dfltFastingPerio2 = val.dfltFastingPeriodUOM) !== null && _val$dfltFastingPerio2 !== void 0 && _val$dfltFastingPerio2._id ? val === null || val === void 0 ? void 0 : val.dfltFastingPeriodUOM : null,
+    SpecimenContainer: val !== null && val !== void 0 && (_val$dfltSpecimenCont2 = val.dfltSpecimenContainer) !== null && _val$dfltSpecimenCont2 !== void 0 && _val$dfltSpecimenCont2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenContainer : null,
+    CollectionMethod: val !== null && val !== void 0 && (_val$dfltSpecimenColl2 = val.dfltSpecimenCollectionMethod) !== null && _val$dfltSpecimenColl2 !== void 0 && _val$dfltSpecimenColl2._id ? val === null || val === void 0 ? void 0 : val.dfltSpecimenCollectionMethod : null,
+    instructions: generateInstruction(val === null || val === void 0 ? void 0 : val.instruction, state),
+    Frequency_applicability: frequencyData.length > 0,
+    frequency: frequencyData,
     editData: val === null || val === void 0 ? void 0 : val._key,
     id: val === null || val === void 0 ? void 0 : val.id,
     draftstatus: val === null || val === void 0 ? void 0 : val.draftstatus,
     status: val === null || val === void 0 ? void 0 : val.status,
-    resourceList: (_generateResoure2 = generateResoure(val === null || val === void 0 ? void 0 : val.resourcedefinition)) !== null && _generateResoure2 !== void 0 ? _generateResoure2 : [],
+    resourceList: (_generateResoure2 = generateResoure(val === null || val === void 0 ? void 0 : val.resourcedefinition, resState)) !== null && _generateResoure2 !== void 0 ? _generateResoure2 : [],
     observationList: (_generateObservation2 = generateObservation(val === null || val === void 0 ? void 0 : val.observationdetails)) !== null && _generateObservation2 !== void 0 ? _generateObservation2 : []
-    // observationList: val.observationdetails
   };
 };
-var generateAttribute = function generateAttribute(data, state) {
-  var arr = data === null || data === void 0 ? void 0 : data.map(function (v) {
-    var _state$order_catalog_, _v$AttribComponents$2, _v$AttribComponents$3, _v$AttribComponents$4, _v$AttribComponents$5, _v$AttribComponents$6, _v$AttribComponents$7;
+
+// const generateAttribute = (data, state) => {
+//   let arr = data?.map((v) => {
+//     return {
+//       Attcode: state?.order_catalog_attrcode?.data?.find(
+//         (sys) => v?.AttribComponents?.[0]?.attribCode?.indexOf(sys?.value) > -1
+//       ),
+//       label: v?.AttribComponents?.[0]?.attribLabel,
+//       type: v?.AttribComponents?.[0]?.attribType,
+//       defaultValue:
+//         v?.AttribComponents[0]?.attribType === "Number" ||
+//         v?.AttribComponents[0]?.attribType === "Text"
+//           ? { label: v?.AttribComponents[0]?.attribdefaultVal }
+//           : getDefautlValue(v, state.order_catalog_attrcode.data),
+//       _id: v._key,
+//       isMandatory: v?.AttribComponents[0]?.mandatory
+//     };
+//   }); 
+//   return arr;
+// };
+
+// const generateResoure=(data,state)=>{
+//   let arr = data?.map((v) =>{
+//     return{
+//       resourcetype:  v?.resourcetype,
+//       resourcerole:  v?.resourcerole,
+//       resourcedepartment: v?.[0].resourcedepartment,
+//       resourcename: v?.[0].resourcename
+//     }
+//   } )
+//   return arr
+// }
+
+// const generateAttribute = (data = [], state) => {
+//   return (data ?? []).map((v) => {
+//     const comp = v?.AttribComponents?.[0];
+
+//     return {
+//       Attcode: state?.order_catalog_attrcode?.data?.find((sys) =>
+//         comp?.attribCode && sys?.value
+//           ? comp.attribCode.indexOf(sys.value) > -1
+//           : false
+//       ),
+
+//       label: comp?.attribLabel ?? "",
+//       type: comp?.attribType ?? "",
+
+//       defaultValue:
+//         comp?.attribType === "Number" || comp?.attribType === "Text"
+//           ? { label: comp?.attribdefaultVal ?? "" }
+//           : getDefautlValue(v, state?.order_catalog_attrcode?.data),
+
+//       _id: v?._key ?? "",
+//       isMandatory: comp?.mandatory ?? false,
+//     };
+//   });
+// };
+
+var generateAttribute = function generateAttribute() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var state = arguments.length > 1 ? arguments[1] : undefined;
+  return (data !== null && data !== void 0 ? data : []).filter(function (v) {
+    var _v$AttribComponents;
+    return (v === null || v === void 0 || (_v$AttribComponents = v.AttribComponents) === null || _v$AttribComponents === void 0 ? void 0 : _v$AttribComponents.length) > 0;
+  }) // 👈 ADD THIS
+  .map(function (v) {
+    var _v$AttribComponents2, _state$order_catalog_, _comp$attribLabel, _comp$attribType, _comp$attribdefaultVa, _state$order_catalog_2, _v$_key, _comp$mandatory;
+    var comp = v === null || v === void 0 || (_v$AttribComponents2 = v.AttribComponents) === null || _v$AttribComponents2 === void 0 ? void 0 : _v$AttribComponents2[0];
     return {
       Attcode: state === null || state === void 0 || (_state$order_catalog_ = state.order_catalog_attrcode) === null || _state$order_catalog_ === void 0 || (_state$order_catalog_ = _state$order_catalog_.data) === null || _state$order_catalog_ === void 0 ? void 0 : _state$order_catalog_.find(function (sys) {
-        var _v$AttribComponents$;
-        return ((_v$AttribComponents$ = v.AttribComponents[0]) === null || _v$AttribComponents$ === void 0 || (_v$AttribComponents$ = _v$AttribComponents$.attribCode) === null || _v$AttribComponents$ === void 0 ? void 0 : _v$AttribComponents$.indexOf(sys === null || sys === void 0 ? void 0 : sys.value)) > -1;
+        return comp !== null && comp !== void 0 && comp.attribCode && sys !== null && sys !== void 0 && sys.value ? comp.attribCode.indexOf(sys.value) > -1 : false;
       }),
-      label: (_v$AttribComponents$2 = v.AttribComponents[0]) === null || _v$AttribComponents$2 === void 0 ? void 0 : _v$AttribComponents$2.attribLabel,
-      type: (_v$AttribComponents$3 = v.AttribComponents[0]) === null || _v$AttribComponents$3 === void 0 ? void 0 : _v$AttribComponents$3.attribType,
-      defaultValue: (v === null || v === void 0 || (_v$AttribComponents$4 = v.AttribComponents[0]) === null || _v$AttribComponents$4 === void 0 ? void 0 : _v$AttribComponents$4.attribType) === "Number" || (v === null || v === void 0 || (_v$AttribComponents$5 = v.AttribComponents[0]) === null || _v$AttribComponents$5 === void 0 ? void 0 : _v$AttribComponents$5.attribType) === "Text" ? {
-        label: v === null || v === void 0 || (_v$AttribComponents$6 = v.AttribComponents[0]) === null || _v$AttribComponents$6 === void 0 ? void 0 : _v$AttribComponents$6.attribdefaultVal
-      } : getDefautlValue(v, state.order_catalog_attrcode.data),
-      _id: v._key,
-      isMandatory: v === null || v === void 0 || (_v$AttribComponents$7 = v.AttribComponents[0]) === null || _v$AttribComponents$7 === void 0 ? void 0 : _v$AttribComponents$7.mandatory
+      label: (_comp$attribLabel = comp === null || comp === void 0 ? void 0 : comp.attribLabel) !== null && _comp$attribLabel !== void 0 ? _comp$attribLabel : "",
+      type: (_comp$attribType = comp === null || comp === void 0 ? void 0 : comp.attribType) !== null && _comp$attribType !== void 0 ? _comp$attribType : "",
+      defaultValue: (comp === null || comp === void 0 ? void 0 : comp.attribType) === "Number" || (comp === null || comp === void 0 ? void 0 : comp.attribType) === "Text" ? {
+        label: (_comp$attribdefaultVa = comp === null || comp === void 0 ? void 0 : comp.attribdefaultVal) !== null && _comp$attribdefaultVa !== void 0 ? _comp$attribdefaultVa : ""
+      } : getDefautlValue(v, state === null || state === void 0 || (_state$order_catalog_2 = state.order_catalog_attrcode) === null || _state$order_catalog_2 === void 0 ? void 0 : _state$order_catalog_2.data),
+      _id: (_v$_key = v === null || v === void 0 ? void 0 : v._key) !== null && _v$_key !== void 0 ? _v$_key : "",
+      isMandatory: (_comp$mandatory = comp === null || comp === void 0 ? void 0 : comp.mandatory) !== null && _comp$mandatory !== void 0 ? _comp$mandatory : false
     };
   });
-  return arr;
 };
-var generateResoure = function generateResoure(data, state) {
-  var arr = data === null || data === void 0 ? void 0 : data.map(function (v) {
+var generateResoure = function generateResoure() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return data.map(function (v) {
+    var _v$resourcetype, _v$resourcerole, _v$resourcedepartment, _v$resourcename;
     return {
-      resourcetype: v === null || v === void 0 ? void 0 : v.resourcetype,
-      resourcerole: v === null || v === void 0 ? void 0 : v.resourcerole,
-      resourcedepartment: v === null || v === void 0 ? void 0 : v.resourcedepartment,
-      resourcename: v === null || v === void 0 ? void 0 : v.resourcename
+      resourcetype: (_v$resourcetype = v === null || v === void 0 ? void 0 : v.resourcetype) !== null && _v$resourcetype !== void 0 ? _v$resourcetype : null,
+      resourcerole: (_v$resourcerole = v === null || v === void 0 ? void 0 : v.resourcerole) !== null && _v$resourcerole !== void 0 ? _v$resourcerole : null,
+      resourcedepartment: (_v$resourcedepartment = v === null || v === void 0 ? void 0 : v.resourcedepartment) !== null && _v$resourcedepartment !== void 0 ? _v$resourcedepartment : [],
+      resourcename: (_v$resourcename = v === null || v === void 0 ? void 0 : v.resourcename) !== null && _v$resourcename !== void 0 ? _v$resourcename : []
     };
   });
-  return arr;
 };
-var generateObservation = function generateObservation(data) {
+var generateObservation = function generateObservation() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var arr = data === null || data === void 0 ? void 0 : data.map(function (v) {
     var _v$Sequence, _v$ismandatory, _v$vitalcode;
     return {
@@ -25838,22 +26070,36 @@ var generateObservation = function generateObservation(data) {
   });
   return arr;
 };
-var getDefautlValue = function getDefautlValue(v, attr) {
-  var _obj$AttribValidValue;
-  var obj = attr === null || attr === void 0 ? void 0 : attr.find(function (sys) {
-    var _v$AttribComponents$8;
-    return (v === null || v === void 0 || (_v$AttribComponents$8 = v.AttribComponents[0]) === null || _v$AttribComponents$8 === void 0 || (_v$AttribComponents$8 = _v$AttribComponents$8.attribCode) === null || _v$AttribComponents$8 === void 0 ? void 0 : _v$AttribComponents$8.indexOf(sys === null || sys === void 0 ? void 0 : sys.value)) > -1;
+
+// const getDefautlValue = (v, attr) => {
+//   let obj = attr?.find(
+//     (sys) => v?.AttribComponents[0]?.attribCode?.indexOf(sys?.value) > -1
+//   );
+
+//   let value = obj?.AttribValidValues?.find(
+//     (sys) => v?.AttribComponents[0]?.attribdefaultVal?.indexOf(sys?.label) > -1
+//   );
+//   return value;
+// };
+
+var getDefautlValue = function getDefautlValue(v) {
+  var _v$AttribComponents3, _obj$AttribValidValue;
+  var attr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var comp = v === null || v === void 0 || (_v$AttribComponents3 = v.AttribComponents) === null || _v$AttribComponents3 === void 0 ? void 0 : _v$AttribComponents3[0];
+  if (!comp) return null;
+  var obj = (attr !== null && attr !== void 0 ? attr : []).find(function (sys) {
+    return comp !== null && comp !== void 0 && comp.attribCode && sys !== null && sys !== void 0 && sys.value ? comp.attribCode.indexOf(sys.value) > -1 : false;
   });
   var value = obj === null || obj === void 0 || (_obj$AttribValidValue = obj.AttribValidValues) === null || _obj$AttribValidValue === void 0 ? void 0 : _obj$AttribValidValue.find(function (sys) {
-    var _v$AttribComponents$9;
-    return (v === null || v === void 0 || (_v$AttribComponents$9 = v.AttribComponents[0]) === null || _v$AttribComponents$9 === void 0 || (_v$AttribComponents$9 = _v$AttribComponents$9.attribdefaultVal) === null || _v$AttribComponents$9 === void 0 ? void 0 : _v$AttribComponents$9.indexOf(sys === null || sys === void 0 ? void 0 : sys.label)) > -1;
+    return comp !== null && comp !== void 0 && comp.attribdefaultVal && sys !== null && sys !== void 0 && sys.label ? comp.attribdefaultVal.indexOf(sys.label) > -1 : false;
   });
-  return value;
+  return value !== null && value !== void 0 ? value : null;
 };
-var generateInstruction = function generateInstruction(data, state) {
+var generateInstruction = function generateInstruction() {
   var _obj$Instruction;
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var obj = {};
-  data.forEach(function (element) {
+  (data !== null && data !== void 0 ? data : []).forEach(function (element) {
     var name = element.setuptypeInd;
     if (name in obj) {
       obj[name].data.push(element);
@@ -25894,30 +26140,36 @@ var generateInstruction = function generateInstruction(data, state) {
   // }
 
   var instructionArr = obj === null || obj === void 0 || (_obj$Instruction = obj.Instruction) === null || _obj$Instruction === void 0 || (_obj$Instruction = _obj$Instruction.data) === null || _obj$Instruction === void 0 ? void 0 : _obj$Instruction.map(function (v) {
+    var _v$agecatgcode, _v$OrderInstr$0$patie, _v$OrderInstr, _v$OrderInstr$0$pract, _v$OrderInstr2, _v$OrderInstr$0$prepI, _v$OrderInstr3, _v$OrderInstr$0$deptI, _v$OrderInstr4;
     return {
       encounterType: v.encountertype ? v.encountertype : null,
       gender: v.gendercode ? v.gendercode : null,
       ageRange: v.agegroup ? v.agegroup : null,
-      agecategory: v.agecatgcode.map(function (v) {
+      agecategory: ((_v$agecatgcode = v.agecatgcode) !== null && _v$agecatgcode !== void 0 ? _v$agecatgcode : []).map(function (v) {
         return {
           label: "",
           value: v
         };
       }),
-      patientInstrction: v.OrderInstr[0].patientInst,
-      practitionerInstrction: v.OrderInstr[0].practionerInst,
-      prepratoryInstrction: v.OrderInstr[0].prepInstr,
-      departmentInstrction: v.OrderInstr[0].deptInstr,
+      // patientInstrction: v.OrderInstr[0].patientInst ?? "",
+      // practitionerInstrction: v.OrderInstr[0].practionerInst ?? "",
+      // prepratoryInstrction: v.OrderInstr[0].prepInstr ?? "",
+      // departmentInstrction: v.OrderInstr[0].deptInstr ?? "",
+      patientInstrction: (_v$OrderInstr$0$patie = v === null || v === void 0 || (_v$OrderInstr = v.OrderInstr) === null || _v$OrderInstr === void 0 || (_v$OrderInstr = _v$OrderInstr[0]) === null || _v$OrderInstr === void 0 ? void 0 : _v$OrderInstr.patientInst) !== null && _v$OrderInstr$0$patie !== void 0 ? _v$OrderInstr$0$patie : "",
+      practitionerInstrction: (_v$OrderInstr$0$pract = v === null || v === void 0 || (_v$OrderInstr2 = v.OrderInstr) === null || _v$OrderInstr2 === void 0 || (_v$OrderInstr2 = _v$OrderInstr2[0]) === null || _v$OrderInstr2 === void 0 ? void 0 : _v$OrderInstr2.practionerInst) !== null && _v$OrderInstr$0$pract !== void 0 ? _v$OrderInstr$0$pract : "",
+      prepratoryInstrction: (_v$OrderInstr$0$prepI = v === null || v === void 0 || (_v$OrderInstr3 = v.OrderInstr) === null || _v$OrderInstr3 === void 0 || (_v$OrderInstr3 = _v$OrderInstr3[0]) === null || _v$OrderInstr3 === void 0 ? void 0 : _v$OrderInstr3.prepInstr) !== null && _v$OrderInstr$0$prepI !== void 0 ? _v$OrderInstr$0$prepI : "",
+      departmentInstrction: (_v$OrderInstr$0$deptI = v === null || v === void 0 || (_v$OrderInstr4 = v.OrderInstr) === null || _v$OrderInstr4 === void 0 || (_v$OrderInstr4 = _v$OrderInstr4[0]) === null || _v$OrderInstr4 === void 0 ? void 0 : _v$OrderInstr4.deptInstr) !== null && _v$OrderInstr$0$deptI !== void 0 ? _v$OrderInstr$0$deptI : "",
       _id: v._id
     };
   });
   var ActualData = instructionArr !== undefined ? instructionArr : [];
   return ActualData;
 };
-var generateFrequency = function generateFrequency(data, state) {
+var generateFrequency = function generateFrequency() {
   var _obj$DefaultValues;
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var obj = {};
-  data.forEach(function (element) {
+  (data !== null && data !== void 0 ? data : []).forEach(function (element) {
     var name = element.setuptypeInd;
     if (name in obj) {
       obj[name].data.push(element);
@@ -25959,11 +26211,12 @@ var generateFrequency = function generateFrequency(data, state) {
 
   var frequency = [];
   frequency = obj === null || obj === void 0 || (_obj$DefaultValues = obj.DefaultValues) === null || _obj$DefaultValues === void 0 || (_obj$DefaultValues = _obj$DefaultValues.data) === null || _obj$DefaultValues === void 0 ? void 0 : _obj$DefaultValues.map(function (v) {
+    var _v$agecatgcode2;
     return {
       encounterType: v.encountertype ? v.encountertype : null,
       gender: v.gendercode ? v.gendercode : null,
       ageRange: v.agegroup ? v.agegroup : null,
-      agecategory: v.agecatgcode.map(function (v) {
+      agecategory: ((_v$agecatgcode2 = v.agecatgcode) !== null && _v$agecatgcode2 !== void 0 ? _v$agecatgcode2 : []).map(function (v) {
         return {
           label: "",
           value: v
@@ -25982,8 +26235,9 @@ var generateFrequency = function generateFrequency(data, state) {
   var ActualData = frequency !== undefined ? frequency : [];
   return ActualData;
 };
-var generatefaciltity = function generatefaciltity(data, state) {
-  var facilityArr = data.map(function (v) {
+var generatefaciltity = function generatefaciltity() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var facilityArr = (data !== null && data !== void 0 ? data : []).map(function (v) {
     var _v$apptreqd, _v$apptDurnInMinutes, _v$billnature;
     return {
       entity_type: v.perfOrganizationEntity && v.perfOrganizationEntity._id ? v.perfOrganizationEntity : null,
@@ -26856,6 +27110,7 @@ var EDIT_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/editOrderCatalog
     id,
     state,
     ccState,
+    resState,
     data,
     res,
     _args18 = arguments,
@@ -26869,14 +27124,14 @@ var EDIT_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/editOrderCatalog
         id = payload.id;
         state = getState();
         ccState = state.orderCatalogSlice;
-        state.resourceByAppointmentTypesSlice;
+        resState = state.resourceByAppointmentTypesSlice;
         _context18.n = 2;
         return fetchData({
           body: JSON.stringify(Query.editOrderCatalog(id))
         }, __baseUrl__$1);
       case 2:
         data = _context18.v;
-        res = generateReadResJsonData(data[0], ccState);
+        res = generateReadResJsonData(data[0], ccState, resState);
         return _context18.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: res
         }));
@@ -41047,79 +41302,41 @@ var pendingRescheduleListActions = {
 var pendingRescheduleListSlice = getPendingRescheduleListApiSlice.reducer;
 
 var queries$3 = {
-  geoCodeType: function geoCodeType(type) {
+  geoMasterTypeRead: function geoMasterTypeRead() {
+    var filterType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "GEOCODE";
     return {
       db_name: dbName,
-      entity: "CodingMaster",
-      sort: "CodingMaster.display",
-      filter: "CodingMaster.activestatus==true && CodingMaster.Type=='GEOCODE'",
-      return_fields: "CodingMaster"
+      queryid: "b283129b-9841-419b-bdfc-de5105ebbad7",
+      filter: {
+        type: filterType,
+        code: "",
+        sortField: "",
+        status: ""
+      }
     };
   },
-  geoParentType: function geoParentType(type) {
+  geoHierarchicalRead: function geoHierarchicalRead(displayLevel) {
+    var parentCode = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "";
     return {
       db_name: dbName,
-      entity: "CodingMaster",
-      sort: "CodingMaster.display",
-      filter: "CodingMaster.activestatus==true && CodingMaster.Type=='GEOCODE'",
-      return_fields: "CodingMaster"
+      queryid: "ad647bcf-edcc-44ac-9ca9-67c3b277b8df",
+      filter: {
+        activestatus: true,
+        display: displayLevel.toUpperCase(),
+        geoglevelcode: parentCode || ""
+      }
     };
   },
-  //COUNTRY READ
   geoCountryRead: function geoCountryRead() {
     return {
       db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && lower(document(SMGeographicMaster.geogLevelType).display)=='country'",
-      sort: "SMGeographicMaster.createddate desc",
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, GeoLocationISDCode :SMGeographicMaster.GeoLocationISDCode, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.active,_key:SMGeographicMaster._key}"
-    };
-  },
-  //STATE READ
-  geoStateRead: function geoStateRead(id) {
-    var _ref, _ref$toUpperCase;
-    return {
-      db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && upper(document(SMGeographicMaster.geogLevelType).display)=='STATE'  && upper(document(SMGeographicMaster.parentGeogLevelCode).geogLevelCode)=='".concat((_ref = id || "") === null || _ref === void 0 || (_ref$toUpperCase = _ref.toUpperCase) === null || _ref$toUpperCase === void 0 ? void 0 : _ref$toUpperCase.call(_ref), "'"),
-      sort: "SMGeographicMaster.createddate desc",
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.active,_key:SMGeographicMaster._key}"
-    };
-  },
-  //DISTRICT READ
-  geoDistrictRead: function geoDistrictRead(id) {
-    var _ref2, _ref2$toUpperCase;
-    return {
-      db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && upper(document(SMGeographicMaster.geogLevelType).display)=='DISTRICT'  && upper(document(SMGeographicMaster.parentGeogLevelCode).geogLevelCode)=='".concat((_ref2 = id || "") === null || _ref2 === void 0 || (_ref2$toUpperCase = _ref2.toUpperCase) === null || _ref2$toUpperCase === void 0 ? void 0 : _ref2$toUpperCase.call(_ref2), "'"),
-      sort: "SMGeographicMaster.createddate desc",
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.active,_key:SMGeographicMaster._key}"
-    };
-  },
-  //CITY READ
-  geoCityRead: function geoCityRead(id) {
-    var _ref3, _ref3$toUpperCase;
-    return {
-      db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && upper(document(SMGeographicMaster.geogLevelType).display)=='CITY'  && upper(document(SMGeographicMaster.parentGeogLevelCode).geogLevelCode)=='".concat((_ref3 = id || "") === null || _ref3 === void 0 || (_ref3$toUpperCase = _ref3.toUpperCase) === null || _ref3$toUpperCase === void 0 ? void 0 : _ref3$toUpperCase.call(_ref3), "'"),
-      sort: "SMGeographicMaster.createddate desc",
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.active,_key:SMGeographicMaster._key}"
-    };
-  },
-  //PINCODE READ
-  geoPincodeRead: function geoPincodeRead(id) {
-    var _ref4, _ref4$toUpperCase;
-    return {
-      db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && upper(document(SMGeographicMaster.geogLevelType).display)=='PINCODE'  && upper(document(SMGeographicMaster.parentGeogLevelCode).geogLevelCode)=='".concat((_ref4 = id || "") === null || _ref4 === void 0 || (_ref4$toUpperCase = _ref4.toUpperCase) === null || _ref4$toUpperCase === void 0 ? void 0 : _ref4$toUpperCase.call(_ref4), "'"),
-      sort: "SMGeographicMaster.createddate desc",
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.active,_key:SMGeographicMaster._key}"
+      queryid: "e2cb9d5c-3491-40da-8a5b-c8f90c39e286",
+      filter: {
+        Leveltype: "country",
+        activestatus: true
+      }
     };
   },
-  //STATUS CHANGE
   geoStatusChange: function geoStatusChange(data) {
     return [{
       db_name: dbName,
@@ -41135,73 +41352,77 @@ var queries$3 = {
       }
     }];
   },
-  //GEOGRAPHIC_MASTER_MASTER
-  geoMasterMaster: function geoMasterMaster() {
+  editGeoGraphicSingleRead: function editGeoGraphicSingleRead(id) {
     return {
       db_name: dbName,
-      entity: "CodingMaster",
-      sort: "CodingMaster.display",
-      filter: "CodingMaster.activestatus==true && CodingMaster.Type=='GEOCODE'",
-      return_fields: "CodingMaster"
+      queryid: "be0b63d3-9d9a-46e3-8073-94a66c050541",
+      filter: {
+        activestatus: true,
+        key: id || ""
+      }
     };
   },
-  //GEOGRAPHIC_PARENT_CODE
   geoMasterParentCode: function geoMasterParentCode(id) {
     return {
       db_name: dbName,
-      entity: "SMGeographicMaster",
-      sort: "SMGeographicMaster.geogLevelName",
-      filter: "SMGeographicMaster.geogLevelType=='".concat(id, "' && SMGeographicMaster.activestatus==true"),
-      return_fields: "{id:SMGeographicMaster.id,_id:SMGeographicMaster._id,geogLevelCode:SMGeographicMaster.geogLevelCode,geogLevelName:SMGeographicMaster.geogLevelName,geogLevelType:document(SMGeographicMaster.geogLevelType).display,parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType),parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode),GeoLocationISDCode:SMGeographicMaster.GeoLocationISDCode,_key:SMGeographicMaster._key}"
+      queryid: "063ee1f3-c2ea-4cb9-bcf5-75e434b7e583",
+      filter: {
+        activestatus: true,
+        Leveltype: id || "",
+        code: ""
+      }
     };
   },
-  //GEOGRAPHIC_SINGLE_READ
-  editGeoGraphicSingleRead: function editGeoGraphicSingleRead(id) {
+  geoCodeExits: function geoCodeExits(_ref) {
+    var levelType = _ref.levelType,
+      geoLevelCode = _ref.geoLevelCode;
     return {
       db_name: dbName,
-      entity: "SMGeographicMaster",
-      filter: "SMGeographicMaster.activestatus==true && SMGeographicMaster._key=='".concat(id, "'"),
-      return_fields: "{_id:SMGeographicMaster._id, id:SMGeographicMaster.id, geogLevelType:document(SMGeographicMaster.geogLevelType), geogLevelCode:SMGeographicMaster.geogLevelCode, geogLevelName:SMGeographicMaster.geogLevelName, parentGeogLevelType:document(SMGeographicMaster.parentGeogLevelType), GeoLocationISDCode :SMGeographicMaster.GeoLocationISDCode, parentGeogLevelCode:document(SMGeographicMaster.parentGeogLevelCode), active: SMGeographicMaster.activestatus,_key:SMGeographicMaster._key}"
+      queryid: "063ee1f3-c2ea-4cb9-bcf5-75e434b7e583",
+      filter: {
+        Leveltype: levelType,
+        code: geoLevelCode,
+        activestatus: true
+      }
     };
-  },
-  //geo code exits checking
-  geoCodeExits: function geoCodeExits(_ref5) {
-    var levelType = _ref5.levelType,
-      geoLevelCode = _ref5.geoLevelCode;
-    return "{\n\t\t\t\"db_name\": \"".concat(dbName, "\",\n\t\t\t\"entity\": \"SMGeographicMaster\",\n\t\t\t\"filter\": \"SMGeographicMaster.geogLevelType=='").concat(levelType, "' && SMGeographicMaster.geogLevelCode=='").concat(geoLevelCode, "'\",\n\t\t\t\"return_fields\": \"SMGeographicMaster\"\n\t\t  }");
   }
 };
 
 var generateJson = function generateJson(data) {
-  var _data$id, _data$type$value, _data$code, _data$name, _data$parentType$valu, _data$parentCode$valu, _data$status, _data$geolocationISD;
-  var filter = {};
-  if (data._key) {
-    filter = {
-      filter: {
-        _key: data._key
-      }
+  var _data$id, _data$type, _data$code, _data$name, _data$parentType, _ref, _data$parentCode$valu, _data$parentCode, _data$status, _data$geolocationISD;
+  var isEdit = !!data._key;
+  var doc = _objectSpread2(_objectSpread2(_objectSpread2({}, isEdit && data._id && data._id !== "" ? {
+    _id: data._id
+  } : {}), !isEdit ? {
+    id: ((_data$id = data.id) === null || _data$id === void 0 ? void 0 : _data$id.toString()) || ""
+  } : {}), {}, {
+    geogLevelType: (_data$type = data.type) !== null && _data$type !== void 0 && _data$type.value ? data.type.value : null,
+    geogLevelCode: ((_data$code = data.code) !== null && _data$code !== void 0 ? _data$code : "").trim() || null,
+    geogLevelName: ((_data$name = data.name) !== null && _data$name !== void 0 ? _data$name : "").trim() || null,
+    parentGeogLevelType: (_data$parentType = data.parentType) !== null && _data$parentType !== void 0 && _data$parentType.value ? data.parentType.value : null,
+    parentGeogLevelCode: ((_ref = (_data$parentCode$valu = (_data$parentCode = data.parentCode) === null || _data$parentCode === void 0 ? void 0 : _data$parentCode.value) !== null && _data$parentCode$valu !== void 0 ? _data$parentCode$valu : data.parentCode) !== null && _ref !== void 0 ? _ref : "").trim() || null,
+    active: (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : true,
+    GeoLocationISDCode: ((_data$geolocationISD = data.geolocationISD) !== null && _data$geolocationISD !== void 0 ? _data$geolocationISD : "").trim() || null
+  });
+  Object.keys(doc).forEach(function (key) {
+    if (doc[key] === null || doc[key] === "" || doc[key] === undefined) {
+      delete doc[key];
+    }
+  });
+  var payloadItem = {
+    db_name: dbName,
+    entity: "SMGeographicMaster",
+    is_metadata: true,
+    metadataId: metaDataId$1,
+    metadata_dbname: metaDatadbName$1,
+    doc: doc
+  };
+  if (isEdit) {
+    payloadItem.filter = {
+      _key: data._key
     };
   }
-  var arr = [_objectSpread2(_objectSpread2({
-    "db_name": dbName,
-    "entity": "SMGeographicMaster",
-    "is_metadata": true
-  }, filter), {}, {
-    "metadataId": metaDataId$1,
-    "metadata_dbname": metaDatadbName$1,
-    "doc": {
-      "_id": "",
-      "id": (_data$id = data.id) !== null && _data$id !== void 0 ? _data$id : "",
-      "geogLevelType": (_data$type$value = data.type.value) !== null && _data$type$value !== void 0 ? _data$type$value : "",
-      "geogLevelCode": (_data$code = data.code) !== null && _data$code !== void 0 ? _data$code : "",
-      "geogLevelName": (_data$name = data.name) !== null && _data$name !== void 0 ? _data$name : "",
-      "parentGeogLevelType": (_data$parentType$valu = data.parentType.value) !== null && _data$parentType$valu !== void 0 ? _data$parentType$valu : "",
-      "parentGeogLevelCode": (_data$parentCode$valu = data.parentCode.value) !== null && _data$parentCode$valu !== void 0 ? _data$parentCode$valu : "",
-      "active": (_data$status = data.status) !== null && _data$status !== void 0 ? _data$status : "",
-      "GeoLocationISDCode": (_data$geolocationISD = data.geolocationISD) !== null && _data$geolocationISD !== void 0 ? _data$geolocationISD : ""
-    }
-  })];
-  return arr;
+  return [payloadItem];
 };
 
 //EDIT READ JSON
@@ -41235,6 +41456,7 @@ var _extraReducers$4;
 var GEOGRAPHIC_TYPE_READ = createAsyncThunk("geographicSlice/geoGraphicTypeRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
   var _ref2,
     rejectWithValue,
+    _data$result,
     queriesjson,
     data,
     arry,
@@ -41245,15 +41467,15 @@ var GEOGRAPHIC_TYPE_READ = createAsyncThunk("geographicSlice/geoGraphicTypeRead"
       case 0:
         _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
         _context.p = 1;
-        queriesjson = queries$3.geoCodeType();
+        queriesjson = queries$3.geoMasterTypeRead();
         _context.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context.v;
         arry = [];
-        data.result.map(function (val, i) {
+        (_data$result = data.result) === null || _data$result === void 0 || _data$result.forEach(function (val) {
           if (val !== null && val !== void 0 && val._id && val !== null && val !== void 0 && val.display) {
             arry.push({
               id: val === null || val === void 0 ? void 0 : val.id,
@@ -41278,6 +41500,7 @@ var GEOGRAPHIC_TYPE_READ = createAsyncThunk("geographicSlice/geoGraphicTypeRead"
 var GEOGRAPHIC_PARENT_READ = createAsyncThunk("geographicSlice/geoParentRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
   var _ref4,
     rejectWithValue,
+    _data$result2,
     queriesjson,
     data,
     arry,
@@ -41288,15 +41511,15 @@ var GEOGRAPHIC_PARENT_READ = createAsyncThunk("geographicSlice/geoParentRead", /
       case 0:
         _ref4 = _args2.length > 1 ? _args2[1] : undefined, rejectWithValue = _ref4.rejectWithValue;
         _context2.p = 1;
-        queriesjson = queries$3.geoParentType();
+        queriesjson = queries$3.geoMasterTypeRead();
         _context2.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context2.v;
         arry = [];
-        data.result.map(function (val, i) {
+        (_data$result2 = data.result) === null || _data$result2 === void 0 || _data$result2.forEach(function (val) {
           if (val !== null && val !== void 0 && val._id && val !== null && val !== void 0 && val.display) {
             arry.push({
               id: val === null || val === void 0 ? void 0 : val.id,
@@ -41318,12 +41541,9 @@ var GEOGRAPHIC_PARENT_READ = createAsyncThunk("geographicSlice/geoParentRead", /
     }
   }, _callee2, null, [[1, 3]]);
 })));
-
-//GEOGRAPHIC_COUNTRY_READ
-var GEOGRAPHIC_COUNTRY_READ = createAsyncThunk("geographicSlice/geoCountryRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+var GEOGRAPHIC_MASTER_MASTER = createAsyncThunk("geographicSlice/geoMasterMaster", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
   var _ref6,
     rejectWithValue,
-    _data$result,
     queriesjson,
     data,
     arry,
@@ -41334,24 +41554,19 @@ var GEOGRAPHIC_COUNTRY_READ = createAsyncThunk("geographicSlice/geoCountryRead",
       case 0:
         _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
         _context3.p = 1;
-        queriesjson = queries$3.geoCountryRead();
+        queriesjson = queries$3.geoMasterTypeRead("GEOCODE");
         _context3.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context3.v;
         arry = [];
-        data === null || data === void 0 || (_data$result = data.result) === null || _data$result === void 0 || _data$result.map(function (val, i) {
-          var _val$id, _val$_id, _val$_key, _val$geogLevelCode, _val$geogLevelName, _val$GeoLocationISDCo;
+        data === null || data === void 0 || data.forEach(function (val) {
+          var _val$_id, _val$display;
           arry.push({
-            id: (_val$id = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id !== void 0 ? _val$id : "",
-            _id: (_val$_id = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id !== void 0 ? _val$_id : "",
-            _key: (_val$_key = val._key) !== null && _val$_key !== void 0 ? _val$_key : "",
-            code: (_val$geogLevelCode = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode !== void 0 ? _val$geogLevelCode : "",
-            name: (_val$geogLevelName = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName !== void 0 ? _val$geogLevelName : "",
-            geoLocationISDCode: (_val$GeoLocationISDCo = val === null || val === void 0 ? void 0 : val.GeoLocationISDCode) !== null && _val$GeoLocationISDCo !== void 0 ? _val$GeoLocationISDCo : "",
-            status: val === null || val === void 0 ? void 0 : val.active
+            value: (_val$_id = val._id) !== null && _val$_id !== void 0 ? _val$_id : "",
+            label: (_val$display = val.display) !== null && _val$display !== void 0 ? _val$display : ""
           });
         });
         return _context3.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -41367,15 +41582,13 @@ var GEOGRAPHIC_COUNTRY_READ = createAsyncThunk("geographicSlice/geoCountryRead",
   }, _callee3, null, [[1, 3]]);
 })));
 
-//GEOGRAPHIC_STATE_READ
+// HIERARCHICAL READS 
 var GEOGRAPHIC_STATE_READ = createAsyncThunk("geographicSlice/geoStateRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
   var payload,
     _ref8,
     rejectWithValue,
-    _data$result2,
     queriesjson,
     data,
-    arry,
     _args4 = arguments,
     _t4;
   return _regenerator().w(function (_context4) {
@@ -41384,28 +41597,14 @@ var GEOGRAPHIC_STATE_READ = createAsyncThunk("geographicSlice/geoStateRead", /*#
         payload = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : {};
         _ref8 = _args4.length > 1 ? _args4[1] : undefined, rejectWithValue = _ref8.rejectWithValue;
         _context4.p = 1;
-        queriesjson = queries$3.geoStateRead(payload === null || payload === void 0 ? void 0 : payload.id);
+        queriesjson = queries$3.geoHierarchicalRead("STATE", payload === null || payload === void 0 ? void 0 : payload.id);
         _context4.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context4.v;
-        arry = [];
-        data === null || data === void 0 || (_data$result2 = data.result) === null || _data$result2 === void 0 || _data$result2.map(function (val, i) {
-          var _val$id2, _val$_id2, _val$_key2, _val$geogLevelCode2, _val$geogLevelName2;
-          arry.push({
-            id: (_val$id2 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id2 !== void 0 ? _val$id2 : "",
-            _id: (_val$_id2 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id2 !== void 0 ? _val$_id2 : "",
-            _key: (_val$_key2 = val._key) !== null && _val$_key2 !== void 0 ? _val$_key2 : "",
-            code: (_val$geogLevelCode2 = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode2 !== void 0 ? _val$geogLevelCode2 : "",
-            name: (_val$geogLevelName2 = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName2 !== void 0 ? _val$geogLevelName2 : "",
-            status: val === null || val === void 0 ? void 0 : val.active
-          });
-        });
-        return _context4.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: arry
-        }));
+        return _context4.a(2, mapToList(data));
       case 3:
         _context4.p = 3;
         _t4 = _context4.v;
@@ -41415,16 +41614,12 @@ var GEOGRAPHIC_STATE_READ = createAsyncThunk("geographicSlice/geoStateRead", /*#
     }
   }, _callee4, null, [[1, 3]]);
 })));
-
-//GEOGRAPHIC_DISTRICT_READ
 var GEOGRAPHIC_DISTRICT_READ = createAsyncThunk("geographicSlice/geoDistrictRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
   var payload,
     _ref0,
     rejectWithValue,
-    _data$result3,
     queriesjson,
     data,
-    arry,
     _args5 = arguments,
     _t5;
   return _regenerator().w(function (_context5) {
@@ -41433,28 +41628,14 @@ var GEOGRAPHIC_DISTRICT_READ = createAsyncThunk("geographicSlice/geoDistrictRead
         payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
         _ref0 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref0.rejectWithValue;
         _context5.p = 1;
-        queriesjson = queries$3.geoDistrictRead(payload === null || payload === void 0 ? void 0 : payload.id);
+        queriesjson = queries$3.geoHierarchicalRead("DISTRICT", payload === null || payload === void 0 ? void 0 : payload.id);
         _context5.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context5.v;
-        arry = [];
-        data === null || data === void 0 || (_data$result3 = data.result) === null || _data$result3 === void 0 || _data$result3.map(function (val, i) {
-          var _val$id3, _val$_id3, _val$_key3, _val$geogLevelCode3, _val$geogLevelName3;
-          arry.push({
-            id: (_val$id3 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id3 !== void 0 ? _val$id3 : "",
-            _id: (_val$_id3 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id3 !== void 0 ? _val$_id3 : "",
-            _key: (_val$_key3 = val._key) !== null && _val$_key3 !== void 0 ? _val$_key3 : "",
-            code: (_val$geogLevelCode3 = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode3 !== void 0 ? _val$geogLevelCode3 : "",
-            name: (_val$geogLevelName3 = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName3 !== void 0 ? _val$geogLevelName3 : "",
-            status: val === null || val === void 0 ? void 0 : val.active
-          });
-        });
-        return _context5.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: arry
-        }));
+        return _context5.a(2, mapToList(data));
       case 3:
         _context5.p = 3;
         _t5 = _context5.v;
@@ -41464,16 +41645,12 @@ var GEOGRAPHIC_DISTRICT_READ = createAsyncThunk("geographicSlice/geoDistrictRead
     }
   }, _callee5, null, [[1, 3]]);
 })));
-
-//GEOGRAPHIC_CITY_READ
 var GEOGRAPHIC_CITY_READ = createAsyncThunk("geographicSlice/geoCityRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
   var payload,
     _ref10,
     rejectWithValue,
-    _data$result4,
     queriesjson,
     data,
-    arry,
     _args6 = arguments,
     _t6;
   return _regenerator().w(function (_context6) {
@@ -41482,28 +41659,14 @@ var GEOGRAPHIC_CITY_READ = createAsyncThunk("geographicSlice/geoCityRead", /*#__
         payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
         _ref10 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref10.rejectWithValue;
         _context6.p = 1;
-        queriesjson = queries$3.geoCityRead(payload === null || payload === void 0 ? void 0 : payload.id);
+        queriesjson = queries$3.geoHierarchicalRead("CITY", payload === null || payload === void 0 ? void 0 : payload.id);
         _context6.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context6.v;
-        arry = [];
-        data === null || data === void 0 || (_data$result4 = data.result) === null || _data$result4 === void 0 || _data$result4.map(function (val, i) {
-          var _val$id4, _val$_id4, _val$_key4, _val$geogLevelCode4, _val$geogLevelName4;
-          arry.push({
-            id: (_val$id4 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id4 !== void 0 ? _val$id4 : "",
-            _id: (_val$_id4 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id4 !== void 0 ? _val$_id4 : "",
-            _key: (_val$_key4 = val._key) !== null && _val$_key4 !== void 0 ? _val$_key4 : "",
-            code: (_val$geogLevelCode4 = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode4 !== void 0 ? _val$geogLevelCode4 : "",
-            name: (_val$geogLevelName4 = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName4 !== void 0 ? _val$geogLevelName4 : "",
-            status: val === null || val === void 0 ? void 0 : val.active
-          });
-        });
-        return _context6.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: arry
-        }));
+        return _context6.a(2, mapToList(data));
       case 3:
         _context6.p = 3;
         _t6 = _context6.v;
@@ -41513,16 +41676,12 @@ var GEOGRAPHIC_CITY_READ = createAsyncThunk("geographicSlice/geoCityRead", /*#__
     }
   }, _callee6, null, [[1, 3]]);
 })));
-
-//GEOGRAPHIC_PINCODE_READ
 var GEOGRAPHIC_PINCODE_READ = createAsyncThunk("geographicSlice/geoPincodeRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
   var payload,
     _ref12,
     rejectWithValue,
-    _data$result5,
     queriesjson,
     data,
-    arry,
     _args7 = arguments,
     _t7;
   return _regenerator().w(function (_context7) {
@@ -41531,28 +41690,14 @@ var GEOGRAPHIC_PINCODE_READ = createAsyncThunk("geographicSlice/geoPincodeRead",
         payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
         _ref12 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref12.rejectWithValue;
         _context7.p = 1;
-        queriesjson = queries$3.geoPincodeRead(payload === null || payload === void 0 ? void 0 : payload.id);
+        queriesjson = queries$3.geoHierarchicalRead("PINCODE", payload === null || payload === void 0 ? void 0 : payload.id);
         _context7.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context7.v;
-        arry = [];
-        data === null || data === void 0 || (_data$result5 = data.result) === null || _data$result5 === void 0 || _data$result5.map(function (val, i) {
-          var _val$id5, _val$_id5, _val$_key5, _val$geogLevelCode5, _val$geogLevelName5;
-          arry.push({
-            id: (_val$id5 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id5 !== void 0 ? _val$id5 : "",
-            _id: (_val$_id5 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id5 !== void 0 ? _val$_id5 : "",
-            _key: (_val$_key5 = val._key) !== null && _val$_key5 !== void 0 ? _val$_key5 : "",
-            code: (_val$geogLevelCode5 = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode5 !== void 0 ? _val$geogLevelCode5 : "",
-            name: (_val$geogLevelName5 = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName5 !== void 0 ? _val$geogLevelName5 : "",
-            status: val === null || val === void 0 ? void 0 : val.active
-          });
-        });
-        return _context7.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: arry
-        }));
+        return _context7.a(2, mapToList(data));
       case 3:
         _context7.p = 3;
         _t7 = _context7.v;
@@ -41562,36 +41707,58 @@ var GEOGRAPHIC_PINCODE_READ = createAsyncThunk("geographicSlice/geoPincodeRead",
     }
   }, _callee7, null, [[1, 3]]);
 })));
-
-//GEOGRAPHIC_STATUS_CHANGE
-var GEOGRAPHIC_STATUS_CHANGE = createAsyncThunk("geographicSlice/geoStatusChange", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
-  var payload,
-    _ref14,
+var mapToList = function mapToList(data) {
+  var arry = [];
+  data === null || data === void 0 || data.forEach(function (val) {
+    var _val$id, _val$_id2, _val$_key, _val$geogLevelCode, _val$geogLevelName;
+    arry.push({
+      id: (_val$id = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id !== void 0 ? _val$id : "",
+      _id: (_val$_id2 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id2 !== void 0 ? _val$_id2 : "",
+      _key: (_val$_key = val._key) !== null && _val$_key !== void 0 ? _val$_key : "",
+      code: (_val$geogLevelCode = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode !== void 0 ? _val$geogLevelCode : "",
+      name: (_val$geogLevelName = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName !== void 0 ? _val$geogLevelName : "",
+      status: val === null || val === void 0 ? void 0 : val.active
+    });
+  });
+  return _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+    data: arry
+  });
+};
+var GEOGRAPHIC_COUNTRY_READ = createAsyncThunk("geographicSlice/geoCountryRead", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8() {
+  var _ref14,
     rejectWithValue,
-    statuschange,
     queriesjson,
     data,
+    arry,
     _args8 = arguments,
     _t8;
   return _regenerator().w(function (_context8) {
     while (1) switch (_context8.p = _context8.n) {
       case 0:
-        payload = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
         _ref14 = _args8.length > 1 ? _args8[1] : undefined, rejectWithValue = _ref14.rejectWithValue;
         _context8.p = 1;
-        statuschange = {
-          _key: payload._key,
-          status: payload.status
-        };
-        queriesjson = queries$3.geoStatusChange(statuschange);
+        queriesjson = queries$3.geoCountryRead();
         _context8.n = 2;
         return fetchData({
           body: JSON.stringify(queriesjson)
-        }, __uspsertUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context8.v;
+        arry = [];
+        data === null || data === void 0 || data.map(function (val, i) {
+          var _val$id2, _val$_id3, _val$_key2, _val$geogLevelCode2, _val$geogLevelName2, _val$GeoLocationISDCo;
+          arry.push({
+            id: (_val$id2 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id2 !== void 0 ? _val$id2 : "",
+            _id: (_val$_id3 = val === null || val === void 0 ? void 0 : val._id) !== null && _val$_id3 !== void 0 ? _val$_id3 : "",
+            _key: (_val$_key2 = val._key) !== null && _val$_key2 !== void 0 ? _val$_key2 : "",
+            code: (_val$geogLevelCode2 = val === null || val === void 0 ? void 0 : val.geogLevelCode) !== null && _val$geogLevelCode2 !== void 0 ? _val$geogLevelCode2 : "",
+            name: (_val$geogLevelName2 = val === null || val === void 0 ? void 0 : val.geogLevelName) !== null && _val$geogLevelName2 !== void 0 ? _val$geogLevelName2 : "",
+            geoLocationISDCode: (_val$GeoLocationISDCo = val === null || val === void 0 ? void 0 : val.GeoLocationISDCode) !== null && _val$GeoLocationISDCo !== void 0 ? _val$GeoLocationISDCo : "",
+            status: val === null || val === void 0 ? void 0 : val.active
+          });
+        });
         return _context8.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: data
+          data: arry
         }));
       case 3:
         _context8.p = 3;
@@ -41603,40 +41770,39 @@ var GEOGRAPHIC_STATUS_CHANGE = createAsyncThunk("geographicSlice/geoStatusChange
   }, _callee8, null, [[1, 3]]);
 })));
 
-//GEOGRAPHIC_MASTER_MASTER
-var GEOGRAPHIC_MASTER_MASTER = createAsyncThunk("geographicSlice/geoMasterMaster", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
-  var _ref16,
+//GEOGRAPHIC_STATUS_CHANGE
+var GEOGRAPHIC_STATUS_CHANGE = createAsyncThunk("geographicSlice/geoStatusChange", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9() {
+  var payload,
+    _ref16,
     rejectWithValue,
+    statuschange,
+    queriesjson,
     data,
-    arry,
     _args9 = arguments,
     _t9;
   return _regenerator().w(function (_context9) {
     while (1) switch (_context9.p = _context9.n) {
       case 0:
+        payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
         _ref16 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref16.rejectWithValue;
         _context9.p = 1;
+        statuschange = {
+          _key: payload._key,
+          status: payload.status
+        };
+        queriesjson = queries$3.geoStatusChange(statuschange);
         _context9.n = 2;
         return fetchData({
-          body: JSON.stringify(queries$3.geoMasterMaster())
-        }, __readDocumentUrl__);
+          body: JSON.stringify(queriesjson)
+        }, __uspsertUrl__);
       case 2:
         data = _context9.v;
-        arry = [];
-        data.result.map(function (val) {
-          var _val$_id6, _val$display;
-          arry.push({
-            value: (_val$_id6 = val._id) !== null && _val$_id6 !== void 0 ? _val$_id6 : "",
-            label: (_val$display = val.display) !== null && _val$display !== void 0 ? _val$display : ""
-          });
-        });
         return _context9.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: arry
+          data: data
         }));
       case 3:
         _context9.p = 3;
         _t9 = _context9.v;
-        alert("error");
         return _context9.a(2, rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
           message: _t9.message
         })));
@@ -41664,15 +41830,15 @@ var GEOGRAPHIC_PARENT_CODE = createAsyncThunk("geographicSlice/geoMasterParentCo
         _context0.n = 2;
         return fetchData({
           body: JSON.stringify(queries$3.geoMasterParentCode(id))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context0.v;
         arry = [];
-        data.result.map(function (val) {
-          var _val$_id7, _val$geogLevelName6;
+        data === null || data === void 0 || data.map(function (val) {
+          var _val$_id4, _val$geogLevelName3;
           arry.push({
-            value: (_val$_id7 = val._id) !== null && _val$_id7 !== void 0 ? _val$_id7 : "",
-            label: (_val$geogLevelName6 = val.geogLevelName) !== null && _val$geogLevelName6 !== void 0 ? _val$geogLevelName6 : ""
+            value: (_val$_id4 = val._id) !== null && _val$_id4 !== void 0 ? _val$_id4 : "",
+            label: (_val$geogLevelName3 = val.geogLevelName) !== null && _val$geogLevelName3 !== void 0 ? _val$geogLevelName3 : ""
           });
         });
         return _context0.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -41749,7 +41915,7 @@ var GEOGRAPIC_EXITS_DATA = createAsyncThunk("geographicSlice/geogrpicExitsData",
             levelType: levelType,
             geoLevelCode: geoLevelCode
           })
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context10.v;
         return _context10.a(2, _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
@@ -41787,7 +41953,7 @@ var GEOGRAPHIC_SINGLE_READ = createAsyncThunk("geographicSlice/geoGraphicSingleR
         _context11.n = 2;
         return fetchData({
           body: JSON.stringify(queries$3.editGeoGraphicSingleRead(_key))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context11.v;
         res = generateReadJSON(data.result[0]);