primary_care_admin_binder 0.1.112 → 0.1.114

package/dist/index.cjs.js

@@ -2508,6 +2508,7 @@ var __holidayAddUrl__ = "".concat(process.env.REACT_APP_APPOINTMENT_API, "/api/a
 // metadata db name & Id
 var metaDatadbName$1 = process.env.REACT_APP_METADATA_DB_NAME;
 var metaDataId$1 = process.env.REACT_APP_METADATAID;
+var tenantId = process.env.REACT_APP_TENANTID;
 
 var moment = createCommonjsModule(function (module, exports) {
 (function (global, factory) {
@@ -11429,7 +11430,7 @@ var generateUpdateJSON$1 = function generateUpdateJSON(editID, Status) {
 };
 
 //for edit read JSON
-var generateReadResJson$1 = function generateReadResJson(data, state, ageCategory) {
+var generateReadResJson = function generateReadResJson(data, state, ageCategory) {
   var list = data.map(function (v) {
     return {
       editData: v._id,
@@ -11966,7 +11967,7 @@ var EDIT_VITAL_MASTER = createAsyncThunk("vitalsMasterSectionApiSlice/editvitalM
           }, __readDocumentUrl__);
         case 11:
           data = _context11.sent;
-          res = generateReadResJson$1(data.result, ccState, category.result);
+          res = generateReadResJson(data.result, ccState, category.result);
           return _context11.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: res
           }));
@@ -23237,12 +23238,19 @@ 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,
-      entity: "OrderType",
-      filter: "OrderType.activestatus==true && OrderType.status==true && OrderType.ordercategory=='".concat(type, "'"),
-      return_fields: "merge(OrderType,{ordercategory:(document(OrderType.ordercategory))})",
-      sort: "OrderType.ordertype"
+      "db_name": dbName$1,
+      "filter": {
+        "ordercategoryId": type
+      },
+      "queryid": "b4c429f4-45d0-438d-89b8-3ca31134ae4a"
     };
   }
 };
@@ -23262,40 +23270,67 @@ 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,
-      "entity": "OrderCatalog",
-      "sort": "OrderCatalog.createddate ASC",
-      "limit": {
-        "offset": page,
-        "count": perPage
+      "filter": {
+        "page": page,
+        "perPage": 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)}))})"
+      "queryid": "0b70b829-2e3e-49b2-85e4-1be22332f351"
     };
   },
   order_catalog_read_search: function order_catalog_read_search(_ref2) {
     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": dbName$1,
-      "entity": "OrderCatalog",
-      "sort": "OrderCatalog.createddate ASC",
-      "limit": {
-        "offset": page,
-        "count": perPage
+      "db_name": "primarycareng",
+      "filter": {
+        "searchval": search,
+        "page": page,
+        "perPage": perPage
       },
-      "filter": "(like(OrderCatalog.shortdesc,'%".concat(search, "%',true) || like(OrderCatalog.longdesc,'%").concat(search, "%',true) || like(OrderCatalog.ordercatalog,'%").concat(search, "%',true))  && OrderCatalog.activestatus==true"),
-      "return_fields": "MERGE(OrderCatalog,{TotalCount:COUNT(FOR cnt IN OrderCatalog FILTER (like(cnt.shortdesc,'%".concat(search, "%',true) || like(cnt.longdesc,'%").concat(search, "%',true) || like(cnt.ordercatalog,'%").concat(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)}))})")
+      "queryid": "603d2995-cff2-4cd3-b89d-13d21be3c79f"
     };
   },
   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,
-      entity: "OrderCatalog",
-      filter: "OrderCatalog.activestatus==true && OrderCatalog._key=='".concat(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)})"
+      "db_name": dbName$1,
+      "filter": {
+        "id": id
+      },
+      "queryid": "d2d0ea53-0a1c-4569-a033-f2a3716e3f1d"
     };
   },
   attributeDelete: function attributeDelete(id) {
@@ -23306,18 +23341,79 @@ 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,
-      entity: "Organization",
-      sort: "Organization.name",
-      filter: "Organization.OrgType ANY =='".concat(name, "' && Organization.activestatus==true"),
-      return_fields: "Organization"
+      "db_name": dbName$1,
+      "filter": {
+        "Orgname": name
+      },
+      "queryid": "b0931347-d3eb-4627-b799-cc701cb8f6c9"
     };
   }
 };
 
-var generateSaveJSON = function generateSaveJSON(data) {
-  var _data$characteristicJ, _data$itemdesc$value, _data$itemdesc;
+var generateSaveChargeCode = function generateSaveChargeCode(data) {
+  var _data$healthcareServi, _data$code, _data$longdes, _data$DuplicatePeriod, _data$shortdes;
+  var filter = {};
+  if (data !== null && data !== void 0 && (_data$healthcareServi = data.healthcareService) !== null && _data$healthcareServi !== void 0 && _data$healthcareServi.value) {
+    var _data$healthcareServi2;
+    filter = {
+      filter: {
+        _id: data === null || data === void 0 ? void 0 : (_data$healthcareServi2 = data.healthcareService) === null || _data$healthcareServi2 === void 0 ? void 0 : _data$healthcareServi2._id
+      }
+    };
+  }
+  return [_objectSpread2$1(_objectSpread2$1({
+    db_name: dbName$1,
+    entity: "RC_ChargeCode",
+    is_metadata: true,
+    metadataId: metaDataId$1,
+    metadata_dbname: metaDatadbName$1
+  }, filter), {}, {
+    doc: {
+      baseqty: 1,
+      chargecode: (_data$code = data === null || data === void 0 ? void 0 : data.code) !== null && _data$code !== void 0 ? _data$code : "",
+      facilityid: "",
+      id: 0,
+      longdesc: (_data$longdes = data.longdes) !== null && _data$longdes !== void 0 ? _data$longdes : "",
+      maxdurnuom: data.DuplicatePeriod ? data === null || data === void 0 ? void 0 : (_data$DuplicatePeriod = data.DuplicatePeriod) === null || _data$DuplicatePeriod === void 0 ? void 0 : _data$DuplicatePeriod._id : "",
+      maxdurnval: data.no ? parseInt(data.no) : 0,
+      maxordqtyuom: data.Maxorder ? data.Maxorder._id : "",
+      maxordqtyval: data.Qtyno ? parseInt(data.maxno) : 0,
+      shortdesc: (_data$shortdes = data.shortdes) !== null && _data$shortdes !== void 0 ? _data$shortdes : "",
+      tenantid: tenantId
+    }
+  })];
+};
+var generateSaveJSON = function generateSaveJSON(data, rcchargeCode) {
+  var _data$resourceList, _data$observationList, _data$DuplicatePeriod2, _data$CheckAction;
+  var resourceresult = data === null || data === void 0 ? void 0 : (_data$resourceList = data.resourceList) === null || _data$resourceList === void 0 ? void 0 : _data$resourceList.map(function (item) {
+    return {
+      resourcetype: item.resourcetype._id,
+      resourcerole: item.resourcerole._id,
+      resourcedepartment: item.resourcedepartment.map(function (department) {
+        return department._id;
+      }),
+      resourcename: item.resourcename.map(function (name) {
+        return name._id;
+      })
+    };
+  });
+  var observationresult = data === null || data === void 0 ? void 0 : (_data$observationList = data.observationList) === null || _data$observationList === void 0 ? void 0 : _data$observationList.map(function (item) {
+    var _item$vitalcode;
+    return {
+      ismandatory: item === null || item === void 0 ? void 0 : item.mandatory,
+      Sequence: item === null || item === void 0 ? void 0 : item.sequence,
+      vitalcode: item === null || item === void 0 ? void 0 : (_item$vitalcode = item.vitalcode) === null || _item$vitalcode === void 0 ? void 0 : _item$vitalcode._id
+    };
+  });
   var filter = {};
   if (data.editData) {
     filter = {
@@ -23347,7 +23443,7 @@ var generateSaveJSON = function generateSaveJSON(data) {
       ordercategory: data.orderCategory ? data.orderCategory.value : "",
       grouporindv: data.groupOrIndividual ? data.groupOrIndividual.value : "",
       ordertype: data.orderType ? data.orderType.value : "",
-      healthcareservicecode: data.healthcareService ? data.healthcareService.value : "",
+      healthcareservicecode: rcchargeCode ? rcchargeCode : "",
       //reflexonresult: "boolean",
       completeonorder: data.characteristicJson[0].checked,
       mappingmoduleId: "",
@@ -23356,8 +23452,8 @@ var generateSaveJSON = function generateSaveJSON(data) {
       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",
@@ -23373,11 +23469,11 @@ var generateSaveJSON = function generateSaveJSON(data) {
       consentformid: data.ConsentForm ? data.ConsentForm.value : "",
       checkforrepeatorders: data.checkSwitch,
       repeatcheckperiod: data.no ? parseInt(data.no) : 0,
-      repeatCheckUOM: data.DuplicatePeriod ? data.DuplicatePeriod.value : "",
-      repeatCheckAction: data.CheckAction ? data.CheckAction.value : "",
+      repeatCheckUOM: data.DuplicatePeriod ? data === null || data === void 0 ? void 0 : (_data$DuplicatePeriod2 = data.DuplicatePeriod) === null || _data$DuplicatePeriod2 === void 0 ? void 0 : _data$DuplicatePeriod2._id : "",
+      repeatCheckAction: data.CheckAction ? data === null || data === void 0 ? void 0 : (_data$CheckAction = data.CheckAction) === null || _data$CheckAction === void 0 ? void 0 : _data$CheckAction._id : "",
       status: data.status,
-      dfltqtyUOM: data.DefaultQuantity ? data.DefaultQuantity.value : "",
-      maxorderqtyUOM: data.Maxorder ? data.Maxorder.value : "",
+      dfltqtyUOM: data.DefaultQuantity ? data.DefaultQuantity._id : "",
+      maxorderqtyUOM: data.Maxorder ? data.Maxorder._id : "",
       dfltSpecimenType: data.SpecimenType ? data.SpecimenType.value : "",
       dfltSpecimenVolume: data.VolumeQuantity ? parseInt(data.VolumeQuantity) : 0,
       dfltSpecimenVolumeUOM: data.Volume ? data.Volume.value : "",
@@ -23386,20 +23482,30 @@ var generateSaveJSON = function generateSaveJSON(data) {
       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)
+      OrderAttribApplicability: getAttributes(data.AttributeList, data.attribute),
+      resourcedefinition: resourceresult !== null && resourceresult !== void 0 ? resourceresult : [],
+      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$value, _v$entity_name, _v$appointment, _parseInt, _v$entity_type$value, _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$value = v === null || v === void 0 ? void 0 : (_v$entity_name = v.entity_name) === null || _v$entity_name === void 0 ? void 0 : _v$entity_name.value) !== null && _v$entity_name$value !== void 0 ? _v$entity_name$value : null,
+      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,
-      perfOrganizationEntity: (_v$entity_type$value = v === null || v === void 0 ? void 0 : (_v$entity_type = v.entity_type) === null || _v$entity_type === void 0 ? void 0 : _v$entity_type.value) !== null && _v$entity_type$value !== void 0 ? _v$entity_type$value : 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
     };
@@ -23408,6 +23514,7 @@ var getAvailability = function getAvailability(data) {
 };
 var getAttributes = function getAttributes(data, attri) {
   var arr = data.map(function (v, i) {
+    var _v$isMandatory;
     return {
       _id: v._id,
       id: 0,
@@ -23418,13 +23525,73 @@ var getAttributes = function getAttributes(data, attri) {
         attribCode: v.Attcode.value,
         attribdefaultVal: v.defaultValue.label,
         attribType: v.type,
-        attribLabel: v.label
+        attribLabel: v.label,
+        mandatory: (_v$isMandatory = v === null || v === void 0 ? void 0 : v.isMandatory) !== null && _v$isMandatory !== void 0 ? _v$isMandatory : false
       }]
     };
   });
   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({
@@ -23432,8 +23599,8 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
       id: 0,
       serviceapplicability: "Service",
       setuptypeInd: "Instruction",
-      encountertype: v.encounterType ? v.encounterType.value : "",
-      gendercode: v.gender ? v.gender.value : "",
+      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;
@@ -23446,6 +23613,10 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
       }]
     });
   });
+  return arr;
+};
+var getFrequency = function getFrequency(fredata, freapp) {
+  var arr = [];
   fredata.map(function (v) {
     arr.push({
       _id: v._id,
@@ -23453,25 +23624,24 @@ var getInstructionAndFrequency = function getInstructionAndFrequency(insdata, fr
       serviceapplicability: "Service",
       setuptypeInd: "DefaultValues",
       ordercatalog: "string",
-      encountertype: v.encounterType ? v.encounterType.value : "",
-      gendercode: v.gender ? v.gender.value : "",
+      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;
       }) : [],
       freqappl: freapp,
       dfltfreqValue: v.freqvalue ? parseInt(v.freqvalue) : 0,
-      dfltfreqValueUnit: v.freqValSelect ? v.freqValSelect.value : "",
+      dfltfreqValueUnit: v.freqValSelect ? v.freqValSelect._id : "",
       dfltfreqRate: v.freqrate ? parseInt(v.freqrate) : 0,
-      dfltfreqRateUnit: v.freqRatSelect ? v.freqRatSelect.value : "",
+      dfltfreqRateUnit: v.freqRatSelect ? v.freqRatSelect._id : "",
       dfltduration: v.freqdura ? parseInt(v.freqdura) : 0,
-      dfltdurationType: v.freqDuraSelect ? v.freqDuraSelect.value : "",
+      dfltdurationType: v.freqDuraSelect ? v.freqDuraSelect._id : "",
       maxdurnallowedinDays: v.freqmax ? parseInt(v.freqmax) : 0
     });
   });
   return arr;
 };
-
 //for table response (readJSon)
 var generateResJson = function generateResJson(data) {
   var list = data.map(function (val) {
@@ -23479,8 +23649,7 @@ var generateResJson = function generateResJson(data) {
       code: val.ordercatalog ? val.ordercatalog : "",
       "short": val.shortdesc ? val.shortdesc : "",
       "long": val.longdesc ? val.longdesc : "",
-      status: val.status ? val.status : false,
-      draft: val.draftstatus
+      status: val.status ? val.status : false
     }, val);
   });
   return list;
@@ -23503,32 +23672,21 @@ var generateUpdateJSON = function generateUpdateJSON(editID, Status) {
   }];
 };
 
-//for edit read JSON
-var generateReadResJson = function generateReadResJson(val, state) {
-  var _val$catalogsynonym, _val$ordercategory, _val$ordertype, _val$healthcareservic, _val$dfltqtyUOM, _val$maxorderqtyUOM, _val$repeatCheckUOM, _val$repeatCheckActio, _val$dfltSpecimenType, _val$dfltSpecimenVolu, _val$dfltSpecimenBody, _val$dfltFastingPerio, _val$dfltSpecimenCont, _val$dfltSpecimenColl;
+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;
   return {
     code: val.ordercatalog,
     longdes: val.longdesc,
     shortdes: val.shortdesc,
-    catalogSynonym: (_val$catalogsynonym = val.catalogsynonym) !== null && _val$catalogsynonym !== void 0 ? _val$catalogsynonym : "",
-    orderCategory: val !== null && val !== void 0 && val.ordercategory && val !== null && val !== void 0 && (_val$ordercategory = val.ordercategory) !== null && _val$ordercategory !== void 0 && _val$ordercategory._id ? state.order_catalog_masters.data.orderCategory.find(function (sys) {
-      return val.ordercategory._id.indexOf(sys.value) > -1;
-    }) : null,
-    orderType: val.ordertype && (_val$ordertype = val.ordertype) !== null && _val$ordertype !== void 0 && _val$ordertype._id ? state.order_catalog_masters.data.orderType.find(function (sys) {
-      return val.ordertype._id.indexOf(sys.value) > -1;
-    }) : null,
-    healthcareService: val.healthcareservicecode && (_val$healthcareservic = val.healthcareservicecode) !== null && _val$healthcareservic !== void 0 && _val$healthcareservic._id ? state.order_catalog_masters.data.healthService.find(function (sys) {
-      return val.healthcareservicecode._id.indexOf(sys.value) > -1;
-    }) : null,
+    catalogSynonym: (_val$catalogsynonym2 = 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.ordertype && (_val$ordertype2 = val.ordertype) !== null && _val$ordertype2 !== void 0 && _val$ordertype2._id ? val.ordertype : null,
+    healthcareService: val.healthcareservicecode && (_val$healthcareservic2 = val.healthcareservicecode) !== null && _val$healthcareservic2 !== void 0 && _val$healthcareservic2._id ? val.healthcareservicecode : null,
     Qtyno: val.dfltqty,
-    DefaultQuantity: val.dfltqtyUOM && (_val$dfltqtyUOM = val.dfltqtyUOM) !== null && _val$dfltqtyUOM !== void 0 && _val$dfltqtyUOM._id ? state.order_catalog_masters.data.quantity.find(function (sys) {
-      return val.dfltqtyUOM._id.indexOf(sys.value) > -1;
-    }) : null,
+    DefaultQuantity: val.dfltqtyUOM && (_val$dfltqtyUOM2 = val.dfltqtyUOM) !== null && _val$dfltqtyUOM2 !== void 0 && _val$dfltqtyUOM2._id ? val.dfltqtyUOM : null,
     AllowQtyCheck: val.allowqtychange,
     maxno: val.maxorderqty,
-    Maxorder: val.maxorderqtyUOM && (_val$maxorderqtyUOM = val.maxorderqtyUOM) !== null && _val$maxorderqtyUOM !== void 0 && _val$maxorderqtyUOM._id ? state.order_catalog_masters.data.quantity.find(function (sys) {
-      return val.maxorderqtyUOM._id.indexOf(sys.value) > -1;
-    }) : null,
+    Maxorder: val.maxorderqtyUOM && (_val$maxorderqtyUOM2 = val.maxorderqtyUOM) !== null && _val$maxorderqtyUOM2 !== void 0 && _val$maxorderqtyUOM2._id ? val.maxorderqtyUOM : null,
     explantorymsg: val.explanatorynote,
     characteristicJson: [{
       label: "Complete On Order",
@@ -23548,67 +23706,77 @@ var generateReadResJson = function generateReadResJson(val, state) {
     }, {
       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$repeatCheckUOM = val.repeatCheckUOM) !== null && _val$repeatCheckUOM !== void 0 && _val$repeatCheckUOM._id ? state.order_catalog_masters.data.quantity.find(function (sys) {
-      return val.repeatCheckUOM._id.indexOf(sys.value) > -1;
-    }) : null,
-    CheckAction: val.repeatCheckAction && (_val$repeatCheckActio = val.repeatCheckAction) !== null && _val$repeatCheckActio !== void 0 && _val$repeatCheckActio._id ? state.order_catalog_masters.data.checkaction.find(function (sys) {
-      return val.repeatCheckAction._id.indexOf(sys.value) > -1;
-    }) : null,
+    DuplicatePeriod: val.repeatCheckUOM && (_val$repeatCheckUOM2 = val.repeatCheckUOM) !== null && _val$repeatCheckUOM2 !== void 0 && _val$repeatCheckUOM2._id ? val.repeatCheckUOM : null,
+    CheckAction: val.repeatCheckAction && (_val$repeatCheckActio2 = val.repeatCheckAction) !== null && _val$repeatCheckActio2 !== void 0 && _val$repeatCheckActio2._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, state),
-    SpecimenType: val.dfltSpecimenType && (_val$dfltSpecimenType = val.dfltSpecimenType) !== null && _val$dfltSpecimenType !== void 0 && _val$dfltSpecimenType._id ? state.order_catalog_masters.data.specimenType.find(function (sys) {
-      return val.dfltSpecimenType._id.indexOf(sys.value) > -1;
-    }) : null,
+    AttributeList: (_generateAttribute2 = generateAttribute(val.OrderAttribApplicability, state)) !== null && _generateAttribute2 !== void 0 ? _generateAttribute2 : [],
+    FacilityData: generatefaciltity(val.AvailablebyPerOrganization),
+    SpecimenType: val.dfltSpecimenType && (_val$dfltSpecimenType2 = val.dfltSpecimenType) !== null && _val$dfltSpecimenType2 !== void 0 && _val$dfltSpecimenType2._id ? val.dfltSpecimenType : null,
     VolumeQuantity: val.dfltSpecimenVolume,
-    Volume: val.dfltSpecimenVolumeUOM && (_val$dfltSpecimenVolu = val.dfltSpecimenVolumeUOM) !== null && _val$dfltSpecimenVolu !== void 0 && _val$dfltSpecimenVolu._id ? state.order_catalog_masters.data.quantity.find(function (sys) {
-      return val.dfltSpecimenVolumeUOM._id.indexOf(sys.value) > -1;
-    }) : null,
-    BodyType: val.dfltSpecimenBodySite && (_val$dfltSpecimenBody = val.dfltSpecimenBodySite) !== null && _val$dfltSpecimenBody !== void 0 && _val$dfltSpecimenBody._id ? state.order_catalog_masters.data.bodySite.find(function (sys) {
-      return val.dfltSpecimenBodySite._id.indexOf(sys.value) > -1;
-    }) : null,
+    Volume: val.dfltSpecimenVolumeUOM && (_val$dfltSpecimenVolu2 = val.dfltSpecimenVolumeUOM) !== null && _val$dfltSpecimenVolu2 !== void 0 && _val$dfltSpecimenVolu2._id ? dfltSpecimenVolumeUOM : null,
+    BodyType: val.dfltSpecimenBodySite && (_val$dfltSpecimenBody2 = val.dfltSpecimenBodySite) !== null && _val$dfltSpecimenBody2 !== void 0 && _val$dfltSpecimenBody2._id ? dfltSpecimenBodySite : null,
     FastingPeriodQuantity: val.dfltFastingPeriod,
-    FastingPeriod: val.dfltFastingPeriodUOM && (_val$dfltFastingPerio = val.dfltFastingPeriodUOM) !== null && _val$dfltFastingPerio !== void 0 && _val$dfltFastingPerio._id ? state.order_catalog_masters.data.quantity.find(function (sys) {
-      return val.dfltFastingPeriodUOM._id.indexOf(sys.value) > -1;
-    }) : null,
-    SpecimenContainer: val.dfltSpecimenContainer && (_val$dfltSpecimenCont = val.dfltSpecimenContainer) !== null && _val$dfltSpecimenCont !== void 0 && _val$dfltSpecimenCont._id ? state.order_catalog_masters.data.specimenContainer.find(function (sys) {
-      return val.dfltSpecimenContainer._id.indexOf(sys.value) > -1;
-    }) : null,
-    CollectionMethod: val.dfltSpecimenCollectionMethod && (_val$dfltSpecimenColl = val.dfltSpecimenCollectionMethod) !== null && _val$dfltSpecimenColl !== void 0 && _val$dfltSpecimenColl._id ? state.order_catalog_masters.data.collectionMethod.find(function (sys) {
-      return val.dfltSpecimenCollectionMethod._id.indexOf(sys.value) > -1;
-    }) : null,
-    instructions: generateInstruction(val.OrderCatalogByEncounterTypeAge, state),
-    Frequency_applicability: generateFrequency(val.OrderCatalogByEncounterTypeAge, state).length > 0 ? true : false,
-    frequency: generateFrequency(val.OrderCatalogByEncounterTypeAge, state),
+    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.instruction),
+    Frequency_applicability: generateFrequency(val.frequency).length > 0 ? true : false,
+    frequency: generateFrequency(val.frequency),
     editData: val._key,
     id: val.id,
     draftstatus: val.draftstatus,
-    status: val.status
+    status: val.status,
+    resourceList: (_generateResoure2 = generateResoure(val.resourcedefinition)) !== null && _generateResoure2 !== void 0 ? _generateResoure2 : [],
+    observationList: (_generateObservation2 = generateObservation(val.observationdetails)) !== null && _generateObservation2 !== void 0 ? _generateObservation2 : []
+    // observationList: val.observationdetails
   };
 };
+
 var generateAttribute = function generateAttribute(data, state) {
   var arr = data.map(function (v) {
     return {
-      Attcode: state.order_catalog_masters.data.attrcode.find(function (sys) {
+      Attcode: state.order_catalog_attrcode.data.find(function (sys) {
         return 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_masters.data.attrcode),
-      _id: v._key
+      } : getDefautlValue(v, state.order_catalog_attrcode.data),
+      _id: v._key,
+      isMandatory: v.AttribComponents[0].mandatory
+    };
+  });
+  return arr;
+};
+var generateResoure = function generateResoure(data, state) {
+  var arr = data === null || data === void 0 ? void 0 : data.map(function (v) {
+    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
+    };
+  });
+  return arr;
+};
+var generateObservation = function generateObservation(data) {
+  var arr = data === null || data === void 0 ? void 0 : data.map(function (v) {
+    var _v$Sequence, _v$ismandatory, _v$vitalcode;
+    return {
+      sequence: (_v$Sequence = v === null || v === void 0 ? void 0 : v.Sequence) !== null && _v$Sequence !== void 0 ? _v$Sequence : "",
+      mandatory: (_v$ismandatory = v === null || v === void 0 ? void 0 : v.ismandatory) !== null && _v$ismandatory !== void 0 ? _v$ismandatory : "",
+      vitalcode: (_v$vitalcode = v === null || v === void 0 ? void 0 : v.vitalcode) !== null && _v$vitalcode !== void 0 ? _v$vitalcode : ""
     };
   });
   return arr;
@@ -23667,15 +23835,9 @@ var generateInstruction = function generateInstruction(data, state) {
 
   var instructionArr = obj === null || obj === void 0 ? void 0 : (_obj$Instruction = obj.Instruction) === null || _obj$Instruction === void 0 ? void 0 : (_obj$Instruction$data = _obj$Instruction.data) === null || _obj$Instruction$data === void 0 ? void 0 : _obj$Instruction$data.map(function (v) {
     return {
-      encounterType: v.encountertype ? state.order_catalog_masters.data.encounterType.find(function (sys) {
-        return v.encountertype.indexOf(sys.value) > -1;
-      }) : null,
-      gender: v.gendercode ? state.order_catalog_masters.data.gender.find(function (sys) {
-        return v.gendercode.indexOf(sys.value) > -1;
-      }) : null,
-      ageRange: v.agegroup ? state.order_catalog_masters.data.ageGroup.find(function (sys) {
-        return v.agegroup.indexOf(sys.value) > -1;
-      }) : null,
+      encounterType: v.encountertype ? v.encountertype : null,
+      gender: v.gendercode ? v.gendercode : null,
+      ageRange: v.agegroup ? v.agegroup : null,
       agecategory: v.agecatgcode.map(function (v) {
         return {
           label: "",
@@ -23738,15 +23900,9 @@ var generateFrequency = function generateFrequency(data, state) {
   var frequency = [];
   frequency = obj === null || obj === void 0 ? void 0 : (_obj$DefaultValues = obj.DefaultValues) === null || _obj$DefaultValues === void 0 ? void 0 : (_obj$DefaultValues$da = _obj$DefaultValues.data) === null || _obj$DefaultValues$da === void 0 ? void 0 : _obj$DefaultValues$da.map(function (v) {
     return {
-      encounterType: v.encountertype ? state.order_catalog_masters.data.encounterType.find(function (sys) {
-        return v.encountertype.indexOf(sys.value) > -1;
-      }) : null,
-      gender: v.gendercode ? state.order_catalog_masters.data.gender.find(function (sys) {
-        return v.gendercode.indexOf(sys.value) > -1;
-      }) : null,
-      ageRange: v.agegroup ? state.order_catalog_masters.data.ageGroup.find(function (sys) {
-        return v.agegroup.indexOf(sys.value) > -1;
-      }) : null,
+      encounterType: v.encountertype ? v.encountertype : null,
+      gender: v.gendercode ? v.gendercode : null,
+      ageRange: v.agegroup ? v.agegroup : null,
       agecategory: v.agecatgcode.map(function (v) {
         return {
           label: "",
@@ -23754,17 +23910,11 @@ var generateFrequency = function generateFrequency(data, state) {
         };
       }),
       freqvalue: v.dfltfreqValue,
-      freqValSelect: v.dfltfreqValueUnit ? state.order_catalog_masters.data.quantity.find(function (sys) {
-        return v.dfltfreqValueUnit.indexOf(sys.value) > -1;
-      }) : null,
+      freqValSelect: v.dfltfreqValueUnit ? v.dfltfreqValueUnit : null,
       freqrate: v.dfltfreqRate,
-      freqRatSelect: v.dfltfreqRateUnit ? state.order_catalog_masters.data.quantity.find(function (sys) {
-        return v.dfltfreqRateUnit.indexOf(sys.value) > -1;
-      }) : null,
+      freqRatSelect: v.dfltfreqRateUnit ? v.dfltfreqRateUnit : null,
       freqdura: v.dfltduration,
-      freqDuraSelect: v.dfltdurationType ? state.order_catalog_masters.data.quantity.find(function (sys) {
-        return v.dfltdurationType.indexOf(sys.value) > -1;
-      }) : null,
+      freqDuraSelect: v.dfltdurationType ? v.dfltdurationType : null,
       freqmax: v.maxdurnallowedinDays,
       _id: v._id
     };
@@ -23774,11 +23924,9 @@ 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 ? state.order_catalog_masters.data.entityType.find(function (sys) {
-        return v.perfOrganizationEntity._id.indexOf(sys.value) > -1;
-      }) : null,
+      entity_type: v.perfOrganizationEntity && v.perfOrganizationEntity._id ? v.perfOrganizationEntity : null,
       // entity_name: v.perforganizationId
       //   ? state.order_catalog_masters.data.entitytName.find(
       //       (sys) => v.perforganizationId._id.indexOf(sys.value) > -1
@@ -23790,8 +23938,9 @@ var generatefaciltity = function generatefaciltity(data, state) {
       } : null,
       appointment: (_v$apptreqd = v === null || v === void 0 ? void 0 : v.apptreqd) !== null && _v$apptreqd !== void 0 ? _v$apptreqd : false,
       duration: (_v$apptDurnInMinutes = v === null || v === void 0 ? void 0 : v.apptDurnInMinutes) !== null && _v$apptDurnInMinutes !== void 0 ? _v$apptDurnInMinutes : "",
-      effective_from: v !== null && v !== void 0 && v.EffFrDate ? new Date(utcTOLocal(v.EffFrDate)).toLocaleDateString() : "",
-      effective_to: v !== null && v !== void 0 && v.EffToDate ? new Date(utcTOLocal(v.EffToDate)).toLocaleDateString() : ""
+      bill_nature: (_v$billnature = v === null || v === void 0 ? void 0 : v.billnature) !== null && _v$billnature !== void 0 ? _v$billnature : "",
+      effective_from: v !== null && v !== void 0 && v.EffFrDate ? new Date(utcTOLocal(v.EffFrDate)).toLocaleDateString('en-GB') : "",
+      effective_to: v !== null && v !== void 0 && v.EffToDate ? new Date(utcTOLocal(v.EffToDate)).toLocaleDateString('en-GB') : ""
     };
   });
   return facilityArr;
@@ -23864,33 +24013,39 @@ var loopMasters$5 = function loopMasters() {
                       if (value.coding[0] !== null) {
                         arr.push({
                           label: value.coding[0].display,
-                          value: value.coding[0]._id
+                          value: value.coding[0]._id,
+                          _id: value.coding[0]._id
                         });
                       }
                     } else if ("orderCategory" === val.name) {
                       arr.push({
                         label: value.ordercategory,
-                        value: value._id
+                        value: value._id,
+                        _id: value._id
                       });
                     } else if ("orderType" === val.name) {
                       arr.push({
                         label: value.ordertype,
-                        value: value._id
+                        value: value._id,
+                        _id: value._id
                       });
                     } else if ("healthService" === val.name) {
                       arr.push({
                         label: value.name,
-                        value: value._id
+                        value: value._id,
+                        _id: value._id
                       });
                     } else if ("entitytName" === val.name) {
                       arr.push({
                         label: value.name,
-                        value: value._id
+                        value: value._id,
+                        _id: value._id
                       });
                     } else if ("ageGroup" === val.name) {
                       arr.push({
                         label: value.agerangecode,
-                        value: value._id
+                        value: value._id,
+                        _id: value._id
                       });
                     } else if ("attrcode" === val.name) {
                       var _value$AttribValidVal;
@@ -23991,170 +24146,167 @@ var ORDER_CATALOG_MASTERS = createAsyncThunk("orderCatalogApiSlice/order_catalog
     }
   }, _callee4, null, [[2, 10]]);
 })));
-var ORDER_CATALOG_GRPORIND = createAsyncThunk("orderCatalogApiSlice/order_catalog_grporind", /*#__PURE__*/function () {
-  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(payload, _ref6) {
-    var rejectWithValue, _data$, _data$$GRPORIND, _data$$GRPORIND$Value, body, data, arry;
-    return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-      while (1) {
-        switch (_context5.prev = _context5.next) {
-          case 0:
-            rejectWithValue = _ref6.rejectWithValue;
-            _context5.prev = 1;
-            // const { type = [], tenantid ="", facilityid="",lang="", allData = false } = payload;
-            body = {
-              "db_name": dbName$1,
-              "filter": {
-                "type": ["GRPORIND"],
-                "tenantid": "",
-                "facilityid": "",
-                "lang": ""
-              },
-              "queryid": "5c46abcb-a1d6-4c2f-ae4f-93ae551a0c6e"
-            };
-            _context5.next = 5;
-            return fetchData({
-              body: JSON.stringify(body)
-            }, __baseUrl__$1);
-          case 5:
-            data = _context5.sent;
-            arry = [];
-            (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$GRPORIND = _data$.GRPORIND) === null || _data$$GRPORIND === void 0 ? void 0 : (_data$$GRPORIND$Value = _data$$GRPORIND.Value) === null || _data$$GRPORIND$Value === void 0 ? void 0 : _data$$GRPORIND$Value.map(function (item) {
-              return arry.push({
-                _id: item._id,
-                value: item._id,
-                label: item.display
-              });
-            });
-            return _context5.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
-              data: arry
-            }));
-          case 11:
-            _context5.prev = 11;
-            _context5.t0 = _context5["catch"](1);
-            return _context5.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-              message: _context5.t0.message
-            })));
-          case 14:
-          case "end":
-            return _context5.stop();
-        }
-      }
-    }, _callee5, null, [[1, 11]]);
-  }));
-  return function (_x6, _x7) {
-    return _ref7.apply(this, arguments);
-  };
-}());
-var ORDER_CATALOG_SERVICEITEM = createAsyncThunk("orderCatalogApiSlice/order_catalog_serviceItem", /*#__PURE__*/function () {
-  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(payload, _ref8) {
-    var rejectWithValue, _data$2, _data$2$ORDERITEMSERV, _data$2$ORDERITEMSERV2, body, data, arry;
-    return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-      while (1) {
-        switch (_context6.prev = _context6.next) {
-          case 0:
-            rejectWithValue = _ref8.rejectWithValue;
-            _context6.prev = 1;
-            // const { type = [], tenantid ="", facilityid="",lang="", allData = false } = payload;
-            body = {
-              "db_name": dbName$1,
-              "filter": {
-                "type": ["ORDERITEMSERVICE"],
-                "tenantid": "",
-                "facilityid": "",
-                "lang": ""
-              },
-              "queryid": "5c46abcb-a1d6-4c2f-ae4f-93ae551a0c6e"
-            };
-            _context6.next = 5;
-            return fetchData({
-              body: JSON.stringify(body)
-            }, __baseUrl__$1);
-          case 5:
-            data = _context6.sent;
-            arry = [];
-            (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$ORDERITEMSERV = _data$2.ORDERITEMSERVICE) === null || _data$2$ORDERITEMSERV === void 0 ? void 0 : (_data$2$ORDERITEMSERV2 = _data$2$ORDERITEMSERV.Value) === null || _data$2$ORDERITEMSERV2 === void 0 ? void 0 : _data$2$ORDERITEMSERV2.map(function (item) {
-              return arry.push({
-                _id: item._id,
-                value: item._id,
-                label: item.display
-              });
-            });
-            return _context6.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
-              data: arry
-            }));
-          case 11:
-            _context6.prev = 11;
-            _context6.t0 = _context6["catch"](1);
-            return _context6.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-              message: _context6.t0.message
-            })));
-          case 14:
-          case "end":
-            return _context6.stop();
-        }
-      }
-    }, _callee6, null, [[1, 11]]);
-  }));
-  return function (_x8, _x9) {
-    return _ref9.apply(this, arguments);
-  };
-}());
-var ENTITY_NAME_DATA = createAsyncThunk("orderCatalogApiSlice/entity_name_data", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+var ORDER_CATALOG_CODING_MASTERS = createAsyncThunk("orderCatalogApiSlice/order_catalog_coding_masters", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
   var payload,
-    _ref11,
+    _ref7,
     rejectWithValue,
-    type,
-    queriesjson,
+    body,
     data,
-    arry,
-    _args7 = arguments;
-  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+    _args5 = arguments;
+  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
     while (1) {
-      switch (_context7.prev = _context7.next) {
+      switch (_context5.prev = _context5.next) {
         case 0:
-          payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
-          _ref11 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref11.rejectWithValue;
-          _context7.prev = 2;
-          type = payload.type;
-          console.log("type", type);
-          queriesjson = Query.entityTypeName(type);
-          _context7.next = 8;
+          payload = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : {};
+          _ref7 = _args5.length > 1 ? _args5[1] : undefined, rejectWithValue = _ref7.rejectWithValue;
+          _context5.prev = 2;
+          payload.type;
+          body = {
+            "db_name": dbName$1,
+            "filter": {
+              "type": payload,
+              "tenantid": "",
+              "facilityid": "",
+              "lang": ""
+            },
+            "queryid": "5c46abcb-a1d6-4c2f-ae4f-93ae551a0c6e"
+          };
+          _context5.next = 7;
           return fetchData({
-            body: JSON.stringify(queriesjson)
-          }, __readDocumentUrl__);
-        case 8:
-          data = _context7.sent;
-          arry = [];
-          data.result.map(function (val) {
-            arry.push({
-              label: val.name,
-              value: val._id
-            });
-          });
-          return _context7.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
-            data: arry
+            body: JSON.stringify(body)
+          }, __baseUrl__$1);
+        case 7:
+          data = _context5.sent;
+          return _context5.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: data
           }));
-        case 14:
-          _context7.prev = 14;
-          _context7.t0 = _context7["catch"](2);
-          return _context7.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context7.t0.message
+        case 11:
+          _context5.prev = 11;
+          _context5.t0 = _context5["catch"](2);
+          return _context5.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context5.t0.message
           })));
-        case 17:
+        case 14:
+        case "end":
+          return _context5.stop();
+      }
+    }
+  }, _callee5, null, [[2, 11]]);
+})));
+var ORDER_CATALOG_ATTRCODE = createAsyncThunk("orderCatalogApiSlice/order_catalog_attrcode", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+  var payload,
+    _ref9,
+    rejectWithValue,
+    body,
+    data,
+    arr,
+    _args6 = arguments;
+  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+    while (1) {
+      switch (_context6.prev = _context6.next) {
+        case 0:
+          payload = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : {};
+          _ref9 = _args6.length > 1 ? _args6[1] : undefined, rejectWithValue = _ref9.rejectWithValue;
+          _context6.prev = 2;
+          payload.type;
+          body = {
+            "db_name": dbName$1,
+            "queryid": "def95574-656e-40c7-928e-b544f2b2f801"
+          };
+          _context6.next = 7;
+          return fetchData({
+            body: JSON.stringify(body)
+          }, __baseUrl__$1);
+        case 7:
+          data = _context6.sent;
+          arr = [];
+          data.map(function (value) {
+            var _value$AttribValidVal2;
+            arr.push({
+              label: value.attribcode,
+              value: value._id,
+              name: value.attriblabel,
+              type: value.attribtype,
+              AttribValidValues: ((_value$AttribValidVal2 = value.AttribValidValues) === null || _value$AttribValidVal2 === void 0 ? void 0 : _value$AttribValidVal2.length) > 0 && value.AttribValidValues.map(function (v) {
+                return {
+                  label: v.validCode,
+                  Dfltflag: v.Dfltflag
+                };
+              })
+            });
+          });
+          return _context6.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: arr
+          }));
+        case 13:
+          _context6.prev = 13;
+          _context6.t0 = _context6["catch"](2);
+          return _context6.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context6.t0.message
+          })));
+        case 16:
+        case "end":
+          return _context6.stop();
+      }
+    }
+  }, _callee6, null, [[2, 13]]);
+})));
+var ORDER_CATALOG_AGEGROUP = createAsyncThunk("orderCatalogApiSlice/order_catalog_agegroup", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+  var payload,
+    _ref11,
+    rejectWithValue,
+    body,
+    data,
+    arr,
+    _args7 = arguments;
+  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+    while (1) {
+      switch (_context7.prev = _context7.next) {
+        case 0:
+          payload = _args7.length > 0 && _args7[0] !== undefined ? _args7[0] : {};
+          _ref11 = _args7.length > 1 ? _args7[1] : undefined, rejectWithValue = _ref11.rejectWithValue;
+          _context7.prev = 2;
+          payload.type;
+          body = {
+            "db_name": dbName$1,
+            "queryid": "869e5895-b0e0-4657-ad31-6ed02294f691"
+          };
+          _context7.next = 7;
+          return fetchData({
+            body: JSON.stringify(body)
+          }, __baseUrl__$1);
+        case 7:
+          data = _context7.sent;
+          arr = [];
+          data.map(function (value) {
+            arr.push({
+              label: value.agerangecode,
+              value: value._id
+            });
+          });
+          return _context7.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: arr
+          }));
+        case 13:
+          _context7.prev = 13;
+          _context7.t0 = _context7["catch"](2);
+          return _context7.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context7.t0.message
+          })));
+        case 16:
         case "end":
           return _context7.stop();
       }
     }
-  }, _callee7, null, [[2, 14]]);
+  }, _callee7, null, [[2, 13]]);
 })));
-var ORDER_TYPE_DATA = createAsyncThunk("orderCatalogApiSlice/order_type_data", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+var ORDER_CATALOG_ORDERCATEGORY = createAsyncThunk("orderCatalogApiSlice/order_catalog_orderCategory", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
   var payload,
     _ref13,
     rejectWithValue,
-    type,
-    queriesjson,
+    body,
     data,
-    arry,
+    arr,
     _args8 = arguments;
   return _regeneratorRuntime().wrap(function _callee8$(_context8) {
     while (1) {
@@ -24163,60 +24315,271 @@ var ORDER_TYPE_DATA = createAsyncThunk("orderCatalogApiSlice/order_type_data", /
           payload = _args8.length > 0 && _args8[0] !== undefined ? _args8[0] : {};
           _ref13 = _args8.length > 1 ? _args8[1] : undefined, rejectWithValue = _ref13.rejectWithValue;
           _context8.prev = 2;
+          payload.type;
+          body = {
+            "db_name": dbName$1,
+            "queryid": "df53fb0d-dd4c-4e65-9067-f5917563625b"
+          };
+          _context8.next = 7;
+          return fetchData({
+            body: JSON.stringify(body)
+          }, __baseUrl__$1);
+        case 7:
+          data = _context8.sent;
+          arr = [];
+          data.map(function (value) {
+            arr.push({
+              label: value.ordercategory,
+              value: value._id
+            });
+          });
+          return _context8.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: arr
+          }));
+        case 13:
+          _context8.prev = 13;
+          _context8.t0 = _context8["catch"](2);
+          return _context8.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context8.t0.message
+          })));
+        case 16:
+        case "end":
+          return _context8.stop();
+      }
+    }
+  }, _callee8, null, [[2, 13]]);
+})));
+var ORDER_CATALOG_GRPORIND = createAsyncThunk("orderCatalogApiSlice/order_catalog_grporind", /*#__PURE__*/function () {
+  var _ref15 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(payload, _ref14) {
+    var rejectWithValue, _data$, _data$$GRPORIND, _data$$GRPORIND$Value, body, data, arry;
+    return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            rejectWithValue = _ref14.rejectWithValue;
+            _context9.prev = 1;
+            // const { type = [], tenantid ="", facilityid="",lang="", allData = false } = payload;
+            body = {
+              "db_name": dbName$1,
+              "filter": {
+                "type": ["GRPORIND"],
+                "tenantid": "",
+                "facilityid": "",
+                "lang": ""
+              },
+              "queryid": "5c46abcb-a1d6-4c2f-ae4f-93ae551a0c6e"
+            };
+            _context9.next = 5;
+            return fetchData({
+              body: JSON.stringify(body)
+            }, __baseUrl__$1);
+          case 5:
+            data = _context9.sent;
+            arry = [];
+            (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : (_data$$GRPORIND = _data$.GRPORIND) === null || _data$$GRPORIND === void 0 ? void 0 : (_data$$GRPORIND$Value = _data$$GRPORIND.Value) === null || _data$$GRPORIND$Value === void 0 ? void 0 : _data$$GRPORIND$Value.map(function (item) {
+              return arry.push({
+                _id: item._id,
+                value: item._id,
+                label: item.display
+              });
+            });
+            return _context9.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+              data: arry
+            }));
+          case 11:
+            _context9.prev = 11;
+            _context9.t0 = _context9["catch"](1);
+            return _context9.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+              message: _context9.t0.message
+            })));
+          case 14:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9, null, [[1, 11]]);
+  }));
+  return function (_x6, _x7) {
+    return _ref15.apply(this, arguments);
+  };
+}());
+var ORDER_CATALOG_SERVICEITEM = createAsyncThunk("orderCatalogApiSlice/order_catalog_serviceItem", /*#__PURE__*/function () {
+  var _ref17 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(payload, _ref16) {
+    var rejectWithValue, _data$2, _data$2$ORDERITEMSERV, _data$2$ORDERITEMSERV2, body, data, arry;
+    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+      while (1) {
+        switch (_context10.prev = _context10.next) {
+          case 0:
+            rejectWithValue = _ref16.rejectWithValue;
+            _context10.prev = 1;
+            // const { type = [], tenantid ="", facilityid="",lang="", allData = false } = payload;
+            body = {
+              "db_name": dbName$1,
+              "filter": {
+                "type": ["ORDERITEMSERVICE"],
+                "tenantid": "",
+                "facilityid": "",
+                "lang": ""
+              },
+              "queryid": "5c46abcb-a1d6-4c2f-ae4f-93ae551a0c6e"
+            };
+            _context10.next = 5;
+            return fetchData({
+              body: JSON.stringify(body)
+            }, __baseUrl__$1);
+          case 5:
+            data = _context10.sent;
+            arry = [];
+            (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : (_data$2$ORDERITEMSERV = _data$2.ORDERITEMSERVICE) === null || _data$2$ORDERITEMSERV === void 0 ? void 0 : (_data$2$ORDERITEMSERV2 = _data$2$ORDERITEMSERV.Value) === null || _data$2$ORDERITEMSERV2 === void 0 ? void 0 : _data$2$ORDERITEMSERV2.map(function (item) {
+              return arry.push({
+                _id: item._id,
+                value: item._id,
+                label: item.display
+              });
+            });
+            return _context10.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+              data: arry
+            }));
+          case 11:
+            _context10.prev = 11;
+            _context10.t0 = _context10["catch"](1);
+            return _context10.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+              message: _context10.t0.message
+            })));
+          case 14:
+          case "end":
+            return _context10.stop();
+        }
+      }
+    }, _callee10, null, [[1, 11]]);
+  }));
+  return function (_x8, _x9) {
+    return _ref17.apply(this, arguments);
+  };
+}());
+var ENTITY_NAME_DATA = createAsyncThunk("orderCatalogApiSlice/entity_name_data", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+  var payload,
+    _ref19,
+    rejectWithValue,
+    type,
+    queriesjson,
+    data,
+    arry,
+    _args11 = arguments;
+  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+    while (1) {
+      switch (_context11.prev = _context11.next) {
+        case 0:
+          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
+          _ref19 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref19.rejectWithValue;
+          _context11.prev = 2;
+          type = payload.type;
+          queriesjson = Query.entityTypeName(type); //   let payloadData=    {
+          //     "db_name": dbName,
+          //     "filter": {
+          //         "Orgname":type
+          //         },
+          //     "queryid": "b0931347-d3eb-4627-b799-cc701cb8f6c9"
+          // }
+          _context11.next = 7;
+          return fetchData({
+            body: JSON.stringify(queriesjson)
+          }, __baseUrl__$1);
+        case 7:
+          data = _context11.sent;
+          arry = [];
+          data.map(function (val) {
+            arry.push({
+              label: val.name,
+              value: val._id,
+              _id: val._id
+            });
+          });
+          return _context11.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: arry
+          }));
+        case 13:
+          _context11.prev = 13;
+          _context11.t0 = _context11["catch"](2);
+          return _context11.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context11.t0.message
+          })));
+        case 16:
+        case "end":
+          return _context11.stop();
+      }
+    }
+  }, _callee11, null, [[2, 13]]);
+})));
+var ORDER_TYPE_DATA = createAsyncThunk("orderCatalogApiSlice/order_type_data", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+  var payload,
+    _ref21,
+    rejectWithValue,
+    type,
+    queriesjson,
+    data,
+    arry,
+    _args12 = arguments;
+  return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+    while (1) {
+      switch (_context12.prev = _context12.next) {
+        case 0:
+          payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+          _ref21 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref21.rejectWithValue;
+          _context12.prev = 2;
           type = payload.type;
-          console.log("type", type);
           queriesjson = orderTypedata.ordertype(type);
-          _context8.next = 8;
+          _context12.next = 7;
           return fetchData({
             body: JSON.stringify(queriesjson)
-          }, __readDocumentUrl__);
-        case 8:
-          data = _context8.sent;
+          }, __baseUrl__$1);
+        case 7:
+          data = _context12.sent;
           arry = [];
-          data.result.map(function (val) {
+          data.map(function (val) {
             arry.push({
               label: val.ordertype,
               value: val._id
             });
           });
-          return _context8.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+          return _context12.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
             data: arry
           }));
-        case 14:
-          _context8.prev = 14;
-          _context8.t0 = _context8["catch"](2);
-          return _context8.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context8.t0.message
+        case 13:
+          _context12.prev = 13;
+          _context12.t0 = _context12["catch"](2);
+          return _context12.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context12.t0.message
           })));
-        case 17:
+        case 16:
         case "end":
-          return _context8.stop();
+          return _context12.stop();
       }
     }
-  }, _callee8, null, [[2, 14]]);
+  }, _callee12, null, [[2, 13]]);
 })));
-var AGE_RANGES_CATEGORY_CATALOG = createAsyncThunk("orderCatalogApiSlice/ageranges_Category", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+var AGE_RANGES_CATEGORY_CATALOG = createAsyncThunk("orderCatalogApiSlice/ageranges_Category", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
   var payload,
-    _ref15,
+    _ref23,
     rejectWithValue,
     ageRangeId,
     data,
     arr,
-    _args9 = arguments;
-  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+    _args13 = arguments;
+  return _regeneratorRuntime().wrap(function _callee13$(_context13) {
     while (1) {
-      switch (_context9.prev = _context9.next) {
+      switch (_context13.prev = _context13.next) {
         case 0:
-          payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
-          _ref15 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref15.rejectWithValue;
-          _context9.prev = 2;
+          payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
+          _ref23 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref23.rejectWithValue;
+          _context13.prev = 2;
           ageRangeId = payload.ageRangeId;
-          _context9.next = 6;
+          _context13.next = 6;
           return fetchData({
             body: JSON.stringify(Query.ageCategory(ageRangeId))
           }, __readDocumentUrl__);
         case 6:
-          data = _context9.sent;
+          data = _context13.sent;
           arr = [];
           data.result[0].map(function (val) {
             arr.push({
@@ -24226,83 +24589,127 @@ var AGE_RANGES_CATEGORY_CATALOG = createAsyncThunk("orderCatalogApiSlice/agerang
               maxAge: val.age_maximum
             });
           });
-          return _context9.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+          return _context13.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: arr
           }));
         case 12:
-          _context9.prev = 12;
-          _context9.t0 = _context9["catch"](2);
-          return _context9.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context9.t0.message
+          _context13.prev = 12;
+          _context13.t0 = _context13["catch"](2);
+          return _context13.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context13.t0.message
           })));
         case 15:
         case "end":
-          return _context9.stop();
+          return _context13.stop();
       }
     }
-  }, _callee9, null, [[2, 12]]);
+  }, _callee13, null, [[2, 12]]);
 })));
-var SAVE_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/saveOrderCatalog", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+var SAVE_RC_CHARGECODE = createAsyncThunk("orderCatalogApiSlice/savercchargecode", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
   var payload,
-    _ref17,
+    _ref25,
     rejectWithValue,
     list,
     body,
     data,
-    _args10 = arguments;
-  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+    _args14 = arguments;
+  return _regeneratorRuntime().wrap(function _callee14$(_context14) {
     while (1) {
-      switch (_context10.prev = _context10.next) {
+      switch (_context14.prev = _context14.next) {
         case 0:
-          payload = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : {};
-          _ref17 = _args10.length > 1 ? _args10[1] : undefined, rejectWithValue = _ref17.rejectWithValue;
-          _context10.prev = 2;
+          payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
+          _ref25 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref25.rejectWithValue;
+          _context14.prev = 2;
           list = payload.list;
-          body = generateSaveJSON(list);
-          _context10.next = 7;
+          body = generateSaveChargeCode(list);
+          _context14.next = 7;
           return fetchData({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
         case 7:
-          data = _context10.sent;
-          return _context10.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+          data = _context14.sent;
+          return _context14.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
             data: data
           }));
         case 11:
-          _context10.prev = 11;
-          _context10.t0 = _context10["catch"](2);
-          return _context10.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context10.t0.message
+          _context14.prev = 11;
+          _context14.t0 = _context14["catch"](2);
+          return _context14.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context14.t0.message
           })));
         case 14:
         case "end":
-          return _context10.stop();
+          return _context14.stop();
       }
     }
-  }, _callee10, null, [[2, 11]]);
+  }, _callee14, null, [[2, 11]]);
 })));
-var READ_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/orderCatalogRead", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+var SAVE_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/saveOrderCatalog", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
   var payload,
-    _ref19,
+    _ref27,
+    rejectWithValue,
+    list,
+    rcchargeCode,
+    body,
+    data,
+    _args15 = arguments;
+  return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+    while (1) {
+      switch (_context15.prev = _context15.next) {
+        case 0:
+          payload = _args15.length > 0 && _args15[0] !== undefined ? _args15[0] : {};
+          _ref27 = _args15.length > 1 ? _args15[1] : undefined, rejectWithValue = _ref27.rejectWithValue;
+          _context15.prev = 2;
+          list = payload.list, rcchargeCode = payload.rcchargeCode; // let SaveChargeCode =generateSaveChargeCode(list)
+          // const SaveChargeCodedata = fetchData(
+          //   { body: JSON.stringify(SaveChargeCode) },
+          //   __uspsertUrl__
+          // );
+          body = generateSaveJSON(list, rcchargeCode);
+          _context15.next = 7;
+          return fetchData({
+            body: JSON.stringify(body)
+          }, __uspsertUrl__);
+        case 7:
+          data = _context15.sent;
+          return _context15.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.Info), {}, {
+            data: data
+          }));
+        case 11:
+          _context15.prev = 11;
+          _context15.t0 = _context15["catch"](2);
+          return _context15.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context15.t0.message
+          })));
+        case 14:
+        case "end":
+          return _context15.stop();
+      }
+    }
+  }, _callee15, null, [[2, 11]]);
+})));
+var READ_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/orderCatalogRead", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+  var payload,
+    _ref29,
     rejectWithValue,
     page,
     perPage,
     search,
     data,
     res,
-    _args11 = arguments;
-  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+    _args16 = arguments;
+  return _regeneratorRuntime().wrap(function _callee16$(_context16) {
     while (1) {
-      switch (_context11.prev = _context11.next) {
+      switch (_context16.prev = _context16.next) {
         case 0:
-          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
-          _ref19 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref19.rejectWithValue, _ref19.getState;
-          _context11.prev = 2;
+          payload = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {};
+          _ref29 = _args16.length > 1 ? _args16[1] : undefined, rejectWithValue = _ref29.rejectWithValue, _ref29.getState;
+          _context16.prev = 2;
           // const { encounter_id } = payload;
           // let state = getState();
           // let ccState = state.DiagnosisMasterSlice;
           page = payload.page, perPage = payload.perPage, search = payload.search;
-          _context11.next = 6;
+          _context16.next = 6;
           return fetchData({
             body: JSON.stringify(search ? Query.order_catalog_read_search({
               page: page,
@@ -24312,69 +24719,69 @@ var READ_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/orderCatalogRead
               page: page,
               perPage: perPage
             }))
-          }, __readDocumentUrl__);
+          }, __baseUrl__$1);
         case 6:
-          data = _context11.sent;
-          res = generateResJson(data.result);
-          return _context11.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+          data = _context16.sent;
+          res = generateResJson(data);
+          return _context16.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: res
           }));
         case 11:
-          _context11.prev = 11;
-          _context11.t0 = _context11["catch"](2);
-          return _context11.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context11.t0.message
+          _context16.prev = 11;
+          _context16.t0 = _context16["catch"](2);
+          return _context16.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context16.t0.message
           })));
         case 14:
         case "end":
-          return _context11.stop();
+          return _context16.stop();
       }
     }
-  }, _callee11, null, [[2, 11]]);
+  }, _callee16, null, [[2, 11]]);
 })));
-var UPDATE_ORDER_CATALOG_STATUS = createAsyncThunk("orderCatalogApiSlice/orderCatalogUpdate", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+var UPDATE_ORDER_CATALOG_STATUS = createAsyncThunk("orderCatalogApiSlice/orderCatalogUpdate", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
   var payload,
-    _ref21,
+    _ref31,
     rejectWithValue,
     editId,
     status,
     body,
     data,
-    _args12 = arguments;
-  return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+    _args17 = arguments;
+  return _regeneratorRuntime().wrap(function _callee17$(_context17) {
     while (1) {
-      switch (_context12.prev = _context12.next) {
+      switch (_context17.prev = _context17.next) {
         case 0:
-          payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
-          _ref21 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref21.rejectWithValue;
-          _context12.prev = 2;
+          payload = _args17.length > 0 && _args17[0] !== undefined ? _args17[0] : {};
+          _ref31 = _args17.length > 1 ? _args17[1] : undefined, rejectWithValue = _ref31.rejectWithValue;
+          _context17.prev = 2;
           editId = payload.editId, status = payload.status;
           body = generateUpdateJSON(editId, status);
-          _context12.next = 7;
+          _context17.next = 7;
           return fetchData({
             body: JSON.stringify(body)
           }, __uspsertUrl__);
         case 7:
-          data = _context12.sent;
-          return _context12.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+          data = _context17.sent;
+          return _context17.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: data
           }));
         case 11:
-          _context12.prev = 11;
-          _context12.t0 = _context12["catch"](2);
-          return _context12.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context12.t0.message
+          _context17.prev = 11;
+          _context17.t0 = _context17["catch"](2);
+          return _context17.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context17.t0.message
           })));
         case 14:
         case "end":
-          return _context12.stop();
+          return _context17.stop();
       }
     }
-  }, _callee12, null, [[2, 11]]);
+  }, _callee17, null, [[2, 11]]);
 })));
-var EDIT_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/editOrderCatalog", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+var EDIT_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/editOrderCatalog", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
   var payload,
-    _ref23,
+    _ref33,
     rejectWithValue,
     getState,
     id,
@@ -24382,76 +24789,77 @@ var EDIT_ORDER_CATALOG = createAsyncThunk("orderCatalogApiSlice/editOrderCatalog
     ccState,
     data,
     res,
-    _args13 = arguments;
-  return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+    _args18 = arguments;
+  return _regeneratorRuntime().wrap(function _callee18$(_context18) {
     while (1) {
-      switch (_context13.prev = _context13.next) {
+      switch (_context18.prev = _context18.next) {
         case 0:
-          payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
-          _ref23 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref23.rejectWithValue, getState = _ref23.getState;
-          _context13.prev = 2;
+          payload = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {};
+          _ref33 = _args18.length > 1 ? _args18[1] : undefined, rejectWithValue = _ref33.rejectWithValue, getState = _ref33.getState;
+          _context18.prev = 2;
           id = payload.id;
           state = getState();
           ccState = state.orderCatalogSlice;
-          _context13.next = 8;
+          state.resourceByAppointmentTypesSlice;
+          _context18.next = 9;
           return fetchData({
             body: JSON.stringify(Query.editOrderCatalog(id))
-          }, __readDocumentUrl__);
-        case 8:
-          data = _context13.sent;
-          res = generateReadResJson(data.result[0], ccState);
-          return _context13.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+          }, __baseUrl__$1);
+        case 9:
+          data = _context18.sent;
+          res = generateReadResJsonData(data[0], ccState);
+          return _context18.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: res
           }));
-        case 13:
-          _context13.prev = 13;
-          _context13.t0 = _context13["catch"](2);
-          return _context13.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context13.t0.message
+        case 14:
+          _context18.prev = 14;
+          _context18.t0 = _context18["catch"](2);
+          return _context18.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context18.t0.message
           })));
-        case 16:
+        case 17:
         case "end":
-          return _context13.stop();
+          return _context18.stop();
       }
     }
-  }, _callee13, null, [[2, 13]]);
+  }, _callee18, null, [[2, 14]]);
 })));
-var DELETE_ATTRIBUTE_DELETE = createAsyncThunk("orderCatalogApiSlice/attributesDelete", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+var DELETE_ATTRIBUTE_DELETE = createAsyncThunk("orderCatalogApiSlice/attributesDelete", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
   var payload,
-    _ref25,
+    _ref35,
     rejectWithValue,
     id,
     data,
-    _args14 = arguments;
-  return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+    _args19 = arguments;
+  return _regeneratorRuntime().wrap(function _callee19$(_context19) {
     while (1) {
-      switch (_context14.prev = _context14.next) {
+      switch (_context19.prev = _context19.next) {
         case 0:
-          payload = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
-          _ref25 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref25.rejectWithValue;
-          _context14.prev = 2;
+          payload = _args19.length > 0 && _args19[0] !== undefined ? _args19[0] : {};
+          _ref35 = _args19.length > 1 ? _args19[1] : undefined, rejectWithValue = _ref35.rejectWithValue;
+          _context19.prev = 2;
           id = payload.id;
-          _context14.next = 6;
+          _context19.next = 6;
           return fetchData({
             body: JSON.stringify(Query.attributeDelete(id))
           }, __softDelete__);
         case 6:
-          data = _context14.sent;
-          return _context14.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
+          data = _context19.sent;
+          return _context19.abrupt("return", _objectSpread2$1(_objectSpread2$1({}, defaultState.List), {}, {
             data: data.result
           }));
         case 10:
-          _context14.prev = 10;
-          _context14.t0 = _context14["catch"](2);
-          return _context14.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
-            message: _context14.t0.message
+          _context19.prev = 10;
+          _context19.t0 = _context19["catch"](2);
+          return _context19.abrupt("return", rejectWithValue(_objectSpread2$1(_objectSpread2$1({}, defaultReject), {}, {
+            message: _context19.t0.message
           })));
         case 13:
         case "end":
-          return _context14.stop();
+          return _context19.stop();
       }
     }
-  }, _callee14, null, [[2, 10]]);
+  }, _callee19, null, [[2, 10]]);
 })));
 var orderCatalogSlice = createSlice({
   name: "orderCatalogApiSlice",
@@ -24466,7 +24874,12 @@ var orderCatalogSlice = createSlice({
     order_type_data: _objectSpread2$1({}, defaultState.List),
     entityTypeName: _objectSpread2$1({}, defaultState.List),
     order_catalog_grporind: _objectSpread2$1({}, defaultState.List),
-    order_catalog_serviceItem: _objectSpread2$1({}, defaultState.List)
+    order_catalog_serviceItem: _objectSpread2$1({}, defaultState.List),
+    order_catalog_coding_masters: _objectSpread2$1({}, defaultState.List),
+    order_catalog_attrcode: _objectSpread2$1({}, defaultState.List),
+    order_catalog_agegroup: _objectSpread2$1({}, defaultState.List),
+    order_catalog_orderCategory: _objectSpread2$1({}, defaultState.List),
+    savercchargecode: _objectSpread2$1({}, defaultState.List)
   },
   extraReducers: (_extraReducers$t = {}, _defineProperty(_extraReducers$t, ENTITY_NAME_DATA.fulfilled, function (state, action) {
     state.entityTypeName.loading = false, state.entityTypeName.error = false, state.entityTypeName = action.payload;
@@ -24534,6 +24947,36 @@ var orderCatalogSlice = createSlice({
     state.order_catalog_serviceItem.loading = true, state.order_catalog_serviceItem.error = false, state.order_catalog_serviceItem.loading = true;
   }), _defineProperty(_extraReducers$t, ORDER_CATALOG_SERVICEITEM.rejected, function (state, action) {
     state.order_catalog_serviceItem.loading = false, state.order_catalog_serviceItem.error = true, state.order_catalog_serviceItem = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_CODING_MASTERS.fulfilled, function (state, action) {
+    state.order_catalog_coding_masters.loading = false, state.order_catalog_coding_masters.error = false, state.order_catalog_coding_masters = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_CODING_MASTERS.pending, function (state, action) {
+    state.order_catalog_coding_masters.loading = true, state.order_catalog_coding_masters.error = false, state.order_catalog_coding_masters.loading = true;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_CODING_MASTERS.rejected, function (state, action) {
+    state.order_catalog_coding_masters.loading = false, state.order_catalog_coding_masters.error = true, state.order_catalog_coding_masters = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ATTRCODE.fulfilled, function (state, action) {
+    state.order_catalog_attrcode.loading = false, state.order_catalog_attrcode.error = false, state.order_catalog_attrcode = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ATTRCODE.pending, function (state, action) {
+    state.order_catalog_attrcode.loading = true, state.order_catalog_attrcode.error = false, state.order_catalog_attrcode.loading = true;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ATTRCODE.rejected, function (state, action) {
+    state.order_catalog_attrcode.loading = false, state.order_catalog_attrcode.error = true, state.order_catalog_attrcode = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_AGEGROUP.fulfilled, function (state, action) {
+    state.order_catalog_agegroup.loading = false, state.order_catalog_agegroup.error = false, state.order_catalog_agegroup = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_AGEGROUP.pending, function (state, action) {
+    state.order_catalog_agegroup.loading = true, state.order_catalog_agegroup.error = false, state.order_catalog_agegroup.loading = true;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_AGEGROUP.rejected, function (state, action) {
+    state.order_catalog_agegroup.loading = false, state.order_catalog_agegroup.error = true, state.order_catalog_agegroup = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ORDERCATEGORY.fulfilled, function (state, action) {
+    state.order_catalog_orderCategory.loading = false, state.order_catalog_orderCategory.error = false, state.order_catalog_orderCategory = action.payload;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ORDERCATEGORY.pending, function (state, action) {
+    state.order_catalog_orderCategory.loading = true, state.order_catalog_orderCategory.error = false, state.order_catalog_orderCategory.loading = true;
+  }), _defineProperty(_extraReducers$t, ORDER_CATALOG_ORDERCATEGORY.rejected, function (state, action) {
+    state.order_catalog_orderCategory.loading = false, state.order_catalog_orderCategory.error = true, state.order_catalog_orderCategory = action.payload;
+  }), _defineProperty(_extraReducers$t, SAVE_RC_CHARGECODE.fulfilled, function (state, action) {
+    state.savercchargecode.loading = false, state.savercchargecode.error = false, state.savercchargecode = action.payload;
+  }), _defineProperty(_extraReducers$t, SAVE_RC_CHARGECODE.pending, function (state, action) {
+    state.savercchargecode.loading = true, state.savercchargecode.error = false, state.savercchargecode.loading = true;
+  }), _defineProperty(_extraReducers$t, SAVE_RC_CHARGECODE.rejected, function (state, action) {
+    state.savercchargecode.loading = false, state.savercchargecode.error = true, state.savercchargecode = action.payload;
   }), _extraReducers$t)
 });
 var orderCatalogActions = {
@@ -24547,7 +24990,12 @@ var orderCatalogActions = {
   ORDER_TYPE_DATA: ORDER_TYPE_DATA,
   ENTITY_NAME_DATA: ENTITY_NAME_DATA,
   ORDER_CATALOG_GRPORIND: ORDER_CATALOG_GRPORIND,
-  ORDER_CATALOG_SERVICEITEM: ORDER_CATALOG_SERVICEITEM
+  ORDER_CATALOG_SERVICEITEM: ORDER_CATALOG_SERVICEITEM,
+  ORDER_CATALOG_CODING_MASTERS: ORDER_CATALOG_CODING_MASTERS,
+  ORDER_CATALOG_ATTRCODE: ORDER_CATALOG_ATTRCODE,
+  ORDER_CATALOG_AGEGROUP: ORDER_CATALOG_AGEGROUP,
+  ORDER_CATALOG_ORDERCATEGORY: ORDER_CATALOG_ORDERCATEGORY,
+  SAVE_RC_CHARGECODE: SAVE_RC_CHARGECODE
 };
 var orderCatalogSlice$1 = orderCatalogSlice.reducer;