primary_care_admin_binder 0.1.4 → 0.1.8

package/dist/index.cjs.js

@@ -364,6 +364,10 @@ function _defineProperty(obj, key, value) {
   return obj;
 }
 
+function _objectDestructuringEmpty(obj) {
+  if (obj == null) throw new TypeError("Cannot destructure undefined");
+}
+
 function _toConsumableArray(arr) {
   return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
 }
@@ -2269,143 +2273,6 @@ var __keyClockblockappointment__ = "".concat(process.env.REACT_APP_KEY_CLOCK_API
 var refreshOrgToken = "".concat(__nifiUrl__, "/api/v1/refreshOrgAuthToken");
 var refreshUserToken = "".concat(__nifiUrl__, "/api/v1/refreshAuthToken");
 
-var fetchData = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(input) {
-    var url,
-        __options,
-        res,
-        data,
-        _args = arguments;
-
-    return regeneratorRuntime.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            url = _args.length > 1 && _args[1] !== undefined ? _args[1] : __baseUrl__;
-            __options = {
-              method: "POST",
-              headers: {
-                "Content-Type": "application/json"
-              },
-              body: {}
-            };
-            _context.next = 4;
-            return fetch(url, _objectSpread2(_objectSpread2({}, __options), input));
-
-          case 4:
-            res = _context.sent;
-            _context.next = 7;
-            return res.json();
-
-          case 7:
-            data = _context.sent;
-            return _context.abrupt("return", data);
-
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-
-  return function fetchData(_x) {
-    return _ref3.apply(this, arguments);
-  };
-}();
-
-var queries$n = {
-  rolelist: function rolelist(type) {
-    return {
-      db_name: dbName,
-      entity: "CodeableConceptMaster",
-      filter: "CodeableConceptMaster.Type=='".concat(type, "'"),
-      return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
-    };
-  },
-  upsert: function upsert(data) {
-    var filter = {};
-    var _key = {};
-
-    if (data._key) {
-      filter = {
-        filter: {
-          _key: data._key
-        }
-      };
-    }
-
-    if (data !== null && data !== void 0 && data.coding_key) {
-      _key = {
-        _key: data === null || data === void 0 ? void 0 : data.coding_key
-      };
-    }
-
-    if (data.id) {
-      ({
-        id: data.id
-      });
-    }
-
-    return [_objectSpread2(_objectSpread2({
-      db_name: "primarycare",
-      entity: "CodeableConceptMaster",
-      is_metadata: true,
-      metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd"
-    }, filter), {}, {
-      doc: {
-        text: "",
-        _id: "",
-        id: 0,
-        coding: [_objectSpread2({
-          system: "",
-          version: "1",
-          code: data.code,
-          display: data.description,
-          userSelected: true,
-          Type: data.type,
-          id: data.id,
-          status: data.status
-        }, _key)],
-        Type: data.type,
-        status: data.status
-      }
-    })];
-  },
-  practitioner_by_id: function practitioner_by_id(id) {
-    return {
-      db_name: dbName,
-      entity: "Practitioner",
-      filter: "Practitioner._key=='".concat(id, "' && Practitioner.activestatus==true"),
-      return_fields: "merge(Practitioner,{identifier:(for doc in IdentifierMaster filter doc._id in Practitioner.identifier return merge(doc,{period:(for cod in doc.period return document(cod))})),address:(for a in Practitioner.address return document(a)),communication:( FOR cod IN CodeableConceptMaster filter cod._id in Practitioner.communication RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),marital_status:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.marital_status RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),name:(for a in Practitioner.name return document(a)),nationality:(FOR cod IN SMGeographicMaster filter cod._id==Practitioner.nationality RETURN cod),photo:(for a in Practitioner.photo return document(a)),position:(for pt in CodeableConceptMaster filter pt._id==Practitioner.position return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),practitioner_type:(for pt in CodeableConceptMaster filter pt._id==Practitioner.practitioner_type return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),telecom:(for a in Practitioner.telecom return document(a)),job_experience:(for c in Practitioner.job_experience RETURN merge(c,{jobexperience_contact_details:(for con in c.jobexperience_contact_details return document(con)), jobexperience_address:(for add in c.jobexperience_address return document(add))})),training_details:(for c in Practitioner.training_details RETURN merge(c,{training_contact_details:(for con in c.training_contact_details return document(con)), training_address:(for add in c.training_address return document(add))})),practitioner_role:(for doc in PractitionerRole filter doc._id IN Practitioner.practitioner_role return MERGE(doc,{telecom:(for rol in ContactPointMaster filter rol._id in doc.telecom return rol),role:(for cod in CodeableConceptMaster filter cod._id==doc.role return merge(cod,{coding:(for code in CodingMaster filter code._id in cod.coding return code)})),period:(for per in periodMaster filter per._id in doc.period return per)})),gender:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.gender RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),employee_status:(for pt in CodeableConceptMaster filter pt._id==Practitioner.employee_status return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))}))})"
-    };
-  },
-  practitioner_list: "{\n    \"db_name\": \"".concat(dbName, "\",\n    \"entity\": \"Practitioner\",\n    \"sort\":\"Practitioner.createddate\",\n    \"filter\": \"Practitioner.activestatus==true\",\n    \"return_fields\": \"{id:Practitioner.id,name:(FOR nam IN TO_ARRAY(Practitioner.name) RETURN DOCUMENT(nam).text)[0],type: (for t in CodeableConceptMaster filter t._id == Practitioner.practitioner_type return merge(t,{coding:(for cod in CodingMaster filter cod._id in t.coding return cod.display)})),_key:Practitioner._key,status:Practitioner.status,Practitionerrole:(for pr in PractitionerRole filter pr._id in Practitioner.practitioner_role && pr.primary_specialty==true return merge(pr,{SpecialtyID:(for spe in CodeableConceptMaster filter spe._id ==pr.SpecialtyID return merge(spe,{coding:(for cod in CodingMaster filter cod._id in spe.coding return cod.display)}))}))}\"\n  }"),
-  status_update_practitioner: function status_update_practitioner(data) {
-    return [{
-      db_name: dbName,
-      entity: "Practitioner",
-      filter: {
-        _key: data._key
-      },
-      is_metadata: true,
-      metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
-      doc: {
-        status: data.status
-      }
-    }];
-  },
-  get_entity_by_id: function get_entity_by_id(id) {
-    return {
-      "db_name": dbName,
-      "entity": "Organization",
-      "sort": "Organization.name",
-      "filter": "Organization.activestatus==true && Organization.OrgType any =='".concat(id, "'"),
-      "return_fields": "{_id:Organization._id,_key:Organization._key,id:Organization.id,name:Organization.name,alias:Organization.alias}"
-    };
-  }
-};
-
 var moment = createCommonjsModule(function (module, exports) {
 (function (global, factory) {
     module.exports = factory() ;
@@ -8070,89 +7937,269 @@ var moment = createCommonjsModule(function (module, exports) {
 })));
 });
 
-var contactList = function contactList(data) {
-  var contactLists = [];
+var fetchData = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(input) {
+    var url,
+        __options,
+        res,
+        data,
+        _args = arguments;
 
-  if (data && data.length > 0) {
-    data.map(function (val) {
-      var contactData = {
-        // "_id": "string",
-        "system": val.mode ? val.mode.value : "",
-        "value": val.mobile ? val.mobile : "",
-        "use": val.use ? val.use.value : "",
-        "rank": val.priority ? val.priority.value : "",
-        "valueprefix": val.country_code ? val.country_code.value : "",
-        "period": [{
-          // "_id": "string",
-          "start": moment().unix(),
-          "end": moment().endOf('day').unix() // "id": "number"
+    return regeneratorRuntime.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            url = _args.length > 1 && _args[1] !== undefined ? _args[1] : __baseUrl__;
+            __options = {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: {}
+            };
+            _context.next = 4;
+            return fetch(url, _objectSpread2(_objectSpread2({}, __options), input));
 
-        }] // "id": "number"
+          case 4:
+            res = _context.sent;
+            _context.next = 7;
+            return res.json();
 
-      };
-      contactLists.push(contactData);
-    });
-  }
+          case 7:
+            data = _context.sent;
+            return _context.abrupt("return", data);
 
-  return contactLists;
-}; // Address list
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
 
+  return function fetchData(_x) {
+    return _ref3.apply(this, arguments);
+  };
+}();
 
-var addresslist = function addresslist(data) {
-  var addLists = [];
+var makeName = function makeName() {
+  var _prefix$coding, _prefix$coding$, _suffix$coding, _suffix$coding$;
+
+  var nameObj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var _nameObj$prefix = nameObj.prefix,
+      prefix = _nameObj$prefix === void 0 ? "" : _nameObj$prefix,
+      _nameObj$given = nameObj.given,
+      given = _nameObj$given === void 0 ? "" : _nameObj$given,
+      _nameObj$text = nameObj.text,
+      text = _nameObj$text === void 0 ? "" : _nameObj$text,
+      _nameObj$suffix = nameObj.suffix,
+      suffix = _nameObj$suffix === void 0 ? "" : _nameObj$suffix;
+  var prefixVal = (prefix === null || prefix === void 0 ? void 0 : (_prefix$coding = prefix.coding) === null || _prefix$coding === void 0 ? void 0 : (_prefix$coding$ = _prefix$coding[0]) === null || _prefix$coding$ === void 0 ? void 0 : _prefix$coding$.display) || "";
+  var suffixVal = (suffix === null || suffix === void 0 ? void 0 : (_suffix$coding = suffix.coding) === null || _suffix$coding === void 0 ? void 0 : (_suffix$coding$ = _suffix$coding[0]) === null || _suffix$coding$ === void 0 ? void 0 : _suffix$coding$.display) || "";
+  return "".concat(prefixVal && prefixVal + ".").concat(text && text + " ").concat(given && given + " ").concat(suffixVal && suffixVal);
+};
 
-  if (data && data.length > 0) {
-    data.map(function (val) {
-      var addressData = {
-        // "_id": "string",
-        "use": val.use ? val.use.value : '',
-        "text": val.addressLine1 ? val.addressLine1 : "",
-        "line": val.addressLine2 ? val.addressLine2 : "",
-        "city": val.city ? val.city.value : '',
-        "district": val.district ? val.district.value : "",
-        "state": val.state ? val.state.value : "",
-        "postalCode": val.pincode ? val.pincode : "",
-        "country": val.country ? val.country.value : "",
-        "latitude": "",
-        "longitude": "",
-        'Type': val.type ? val.type.value : ""
-      };
-      addLists.push(addressData);
-    });
+var getUtcTime = function getUtcTime(date) {
+  if (date) {
+    return moment.utc(date).unix();
+  } else {
+    return moment.utc().unix();
   }
-
-  return addLists;
 };
 
-var generateJSON$2 = function generateJSON(data, _key, person_id) {
-  //person id
-  var personId = {};
-
-  if (person_id) {
-    personId = {
-      "PersonID": person_id
-    };
-  } //  filter to update the practitioner
+var utcTOLocal = function utcTOLocal(date, format) {
+  var Ndate = new Date();
 
+  if (typeof date === "number") {
+    Ndate = moment.unix(date);
+  } else {
+    Ndate = moment(date);
+  }
 
-  var filter = {};
+  var fmt = format ? format : "DD-MM-YYYY";
 
-  if (_key) {
-    filter = {
-      "filter": {
-        "_key": _key
-      }
-    };
+  if (format) {
+    return moment.utc(Ndate).local().format(fmt);
+  } else {
+    return moment.utc(Ndate).local();
   }
+};
 
-  var id = {};
-
-  if (!_key) {
-    id = {
-      id: 0
+var queries$n = {
+  rolelist: function rolelist(type) {
+    return {
+      db_name: dbName,
+      entity: "CodeableConceptMaster",
+      filter: "CodeableConceptMaster.Type=='".concat(type, "'"),
+      return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
     };
-  } // PRACTITIONER IDENTIFICATION
-
+  },
+  upsert: function upsert(data) {
+    var filter = {};
+    var _key = {};
+
+    if (data._key) {
+      filter = {
+        filter: {
+          _key: data._key
+        }
+      };
+    }
+
+    if (data !== null && data !== void 0 && data.coding_key) {
+      _key = {
+        _key: data === null || data === void 0 ? void 0 : data.coding_key
+      };
+    }
+
+    if (data.id) {
+      ({
+        id: data.id
+      });
+    }
+
+    return [_objectSpread2(_objectSpread2({
+      db_name: "primarycare",
+      entity: "CodeableConceptMaster",
+      is_metadata: true,
+      metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd"
+    }, filter), {}, {
+      doc: {
+        text: "",
+        _id: "",
+        id: 0,
+        coding: [_objectSpread2({
+          system: "",
+          version: "1",
+          code: data.code,
+          display: data.description,
+          userSelected: true,
+          Type: data.type,
+          id: data.id,
+          status: data.status
+        }, _key)],
+        Type: data.type,
+        status: data.status
+      }
+    })];
+  },
+  practitioner_by_id: function practitioner_by_id(id) {
+    return {
+      db_name: dbName,
+      entity: "Practitioner",
+      filter: "Practitioner._key=='".concat(id, "' && Practitioner.activestatus==true"),
+      return_fields: "merge(Practitioner,{identifier:(for doc in IdentifierMaster filter doc._id in Practitioner.identifier return merge(doc,{period:(for cod in doc.period return document(cod))})),address:(for a in Practitioner.address return document(a)),communication:( FOR cod IN CodeableConceptMaster filter cod._id in Practitioner.communication RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),marital_status:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.marital_status RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),name:(for a in Practitioner.name return document(a)),nationality:(FOR cod IN SMGeographicMaster filter cod._id==Practitioner.nationality RETURN cod),photo:(for a in Practitioner.photo return document(a)),position:(for pt in CodeableConceptMaster filter pt._id==Practitioner.position return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),practitioner_type:(for pt in CodeableConceptMaster filter pt._id==Practitioner.practitioner_type return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))})),telecom:(for a in Practitioner.telecom return document(a)),job_experience:(for c in Practitioner.job_experience RETURN merge(c,{jobexperience_contact_details:(for con in c.jobexperience_contact_details return document(con)), jobexperience_address:(for add in c.jobexperience_address return document(add))})),training_details:(for c in Practitioner.training_details RETURN merge(c,{training_contact_details:(for con in c.training_contact_details return document(con)), training_address:(for add in c.training_address return document(add))})),practitioner_role:(for doc in PractitionerRole filter doc._id IN Practitioner.practitioner_role return MERGE(doc,{telecom:(for rol in ContactPointMaster filter rol._id in doc.telecom return rol),role:(for cod in CodeableConceptMaster filter cod._id==doc.role return merge(cod,{coding:(for code in CodingMaster filter code._id in cod.coding return code)})),period:(for per in periodMaster filter per._id in doc.period return per)})),gender:(FOR cod IN CodeableConceptMaster filter cod._id==Practitioner.gender RETURN MERGE(cod,{coding:(FOR d IN cod.coding RETURN DOCUMENT(d))})),employee_status:(for pt in CodeableConceptMaster filter pt._id==Practitioner.employee_status return merge(pt,{coding:(FOR d IN pt.coding RETURN DOCUMENT(d))}))})"
+    };
+  },
+  practitioner_list: "{\n    \"db_name\": \"".concat(dbName, "\",\n    \"entity\": \"Practitioner\",\n    \"sort\":\"Practitioner.createddate\",\n    \"filter\": \"Practitioner.activestatus==true\",\n    \"return_fields\": \"{id:Practitioner.id,name:(FOR nam IN TO_ARRAY(Practitioner.name) RETURN DOCUMENT(nam).text)[0],type: (for t in CodeableConceptMaster filter t._id == Practitioner.practitioner_type return merge(t,{coding:(for cod in CodingMaster filter cod._id in t.coding return cod.display)})),_key:Practitioner._key,status:Practitioner.status,Practitionerrole:(for pr in PractitionerRole filter pr._id in Practitioner.practitioner_role && pr.primary_specialty==true return merge(pr,{SpecialtyID:(for spe in CodeableConceptMaster filter spe._id ==pr.SpecialtyID return merge(spe,{coding:(for cod in CodingMaster filter cod._id in spe.coding return cod.display)}))}))}\"\n  }"),
+  status_update_practitioner: function status_update_practitioner(data) {
+    return [{
+      db_name: dbName,
+      entity: "Practitioner",
+      filter: {
+        _key: data._key
+      },
+      is_metadata: true,
+      metadataId: "04ecb73d-f048-44ce-8563-c9be015812dd",
+      doc: {
+        status: data.status
+      }
+    }];
+  },
+  get_entity_by_id: function get_entity_by_id(id) {
+    return {
+      "db_name": dbName,
+      "entity": "Organization",
+      "sort": "Organization.name",
+      "filter": "Organization.activestatus==true && Organization.OrgType any =='".concat(id, "'"),
+      "return_fields": "{_id:Organization._id,_key:Organization._key,id:Organization.id,name:Organization.name,alias:Organization.alias}"
+    };
+  }
+};
+
+var contactList = function contactList(data) {
+  var contactLists = [];
+
+  if (data && data.length > 0) {
+    data.map(function (val) {
+      var contactData = {
+        // "_id": "string",
+        "system": val.mode ? val.mode.value : "",
+        "value": val.mobile ? val.mobile : "",
+        "use": val.use ? val.use.value : "",
+        "rank": val.priority ? val.priority.value : "",
+        "valueprefix": val.country_code ? val.country_code.value : "",
+        "period": [{
+          // "_id": "string",
+          "start": getUtcTime(),
+          "end": getUtcTime(moment().endOf('day')) // "id": "number"
+
+        }] // "id": "number"
+
+      };
+      contactLists.push(contactData);
+    });
+  }
+
+  return contactLists;
+}; // Address list
+
+
+var addresslist = function addresslist(data) {
+  var addLists = [];
+
+  if (data && data.length > 0) {
+    data.map(function (val) {
+      var addressData = {
+        // "_id": "string",
+        "use": val.use ? val.use.value : '',
+        "text": val.addressLine1 ? val.addressLine1 : "",
+        "line": val.addressLine2 ? val.addressLine2 : "",
+        "city": val.city ? val.city.value : '',
+        "district": val.district ? val.district.value : "",
+        "state": val.state ? val.state.value : "",
+        "postalCode": val.pincode ? val.pincode : "",
+        "country": val.country ? val.country.value : "",
+        "latitude": "",
+        "longitude": "",
+        'Type': val.type ? val.type.value : ""
+      };
+      addLists.push(addressData);
+    });
+  }
+
+  return addLists;
+};
+
+var generateJSON$2 = function generateJSON(data, _key, person_id) {
+  //person id
+  var personId = {};
+
+  if (person_id) {
+    personId = {
+      "PersonID": person_id
+    };
+  } //  filter to update the practitioner
+
+
+  var filter = {};
+
+  if (_key) {
+    filter = {
+      "filter": {
+        "_key": _key
+      }
+    };
+  }
+
+  var id = {};
+
+  if (!_key) {
+    id = {
+      id: 0
+    };
+  } // PRACTITIONER IDENTIFICATION
+
   if (data.identification && data.identification.length > 0) {
     data.identification.map(function (val) {
       // var given = moment(val.expiry_date, "YYYY-MM-DD");
@@ -8161,7 +8208,7 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
       ({
         "IDType": val.id_type.value ? val.id_type.value : "",
         "IDNumber": val.id_number ? val.id_number : "",
-        "ExpiryDate": val.expiry_date ? moment(val.expiry_date).unix() : null // doc
+        "ExpiryDate": val.expiry_date ? getUtcTime(moment(val.expiry_date)) : null // doc
         // "files": val.doc ? val.doc : []
 
       });
@@ -8180,8 +8227,8 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "files": val.doc ? val.doc : [],
         "period": [{
           // "_id": "string",
-          "start": moment().unix(),
-          "end": val.expiry_date ? moment(val.expiry_date).unix() : null // "id": "number"
+          "start": getUtcTime(),
+          "end": val.expiry_date ? getUtcTime(moment(val.expiry_date)) : null // "id": "number"
 
         }] // "assigner": "string",
         // "Type": "string",
@@ -8207,8 +8254,8 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "suffix": val.suffix ? val.suffix.value : "",
         "period": [{
           // "_id": "",
-          "start": moment().unix(),
-          "end": moment().endOf('day').unix() // "id": "number"
+          "start": getUtcTime(),
+          "end": getUtcTime(moment().endOf('day')) // "id": "number"
 
         }]
       };
@@ -8240,8 +8287,8 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "valueprefix": val.country_code ? val.country_code.value : "",
         "period": [{
           // "_id": "string",
-          "start": moment().unix(),
-          "end": moment().endOf('day').unix() // "id": "number"
+          "start": getUtcTime(),
+          "end": getUtcTime(moment().endOf('day')) // "id": "number"
 
         }] // "id": "number"
 
@@ -8273,8 +8320,8 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         // "EntityName": val.entity_name ? val.entity_name.value : "",
         period: [{
           // "_id": "string",
-          start: val.start_date ? moment(val.start_date).unix() : null,
-          end: val.end_date ? moment(val.end_date).unix() : null // "id": "number"
+          start: val.start_date ? getUtcTime(moment(val.start_date)) : null,
+          end: val.end_date ? getUtcTime(moment(val.end_date)) : null // "id": "number"
 
         }],
         SpecialtyID: val.speciality ? val.speciality.value : "",
@@ -8322,9 +8369,9 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
       var qualificationData = {
         "name": val.name ? val.name : "",
         "university_board": val.qualification_name ? val.qualification_name : "",
-        "issue_date": val.issued_by ? moment(val.issued_by).unix() : null,
-        "valid_from": val.start_date ? moment(val.start_date).unix() : null,
-        "valid_to": val.end_date ? moment(val.end_date).unix() : null,
+        "issue_date": val.issued_by ? getUtcTime(moment(val.issued_by)) : null,
+        "valid_from": val.start_date ? getUtcTime(moment(val.start_date)) : null,
+        "valid_to": val.end_date ? getUtcTime(moment(val.end_date)) : null,
         "files": val.doc ? val.doc : []
       };
       qualification_list.push(qualificationData);
@@ -8353,10 +8400,10 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "organization": val.organization ? val.organization : "",
         "course_name": val.course_name ? val.course_name : "",
         "responsible_person": val.responsible_person ? val.responsible_person : "",
-        "course_start_date": val.course_start_date ? moment(val.course_start_date).unix() : null,
-        "course_end_date": val.course_end_date ? moment(val.course_end_date).unix() : null,
-        "certificate_issued_date": val.certificate_issue_date ? moment(val.certificate_issue_date).unix() : null,
-        "certificate_expiry_date": val.certificate_expiry_date ? moment(val.certificate_expiry_date).unix() : null,
+        "course_start_date": val.course_start_date ? getUtcTime(moment(val.course_start_date)) : null,
+        "course_end_date": val.course_end_date ? getUtcTime(moment(val.course_end_date)) : null,
+        "certificate_issued_date": val.certificate_issue_date ? getUtcTime(moment(val.certificate_issue_date)) : null,
+        "certificate_expiry_date": val.certificate_expiry_date ? getUtcTime(moment(val.certificate_expiry_date)) : null,
         "files": val.doc ? val.doc : [],
         "training_contact_details": contactList(val.contact),
         "training_address": addresslist(val.address)
@@ -8375,8 +8422,8 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "department": val.department ? val.department : "",
         "designation": val.designation ? val.designation : "",
         "role": val.role ? val.role : "",
-        "start_date": val.start_date ? moment(val.start_date).unix() : null,
-        "end_date": val.end_date ? moment(val.end_date).unix() : null,
+        "start_date": val.start_date ? getUtcTime(moment(val.start_date)) : null,
+        "end_date": val.end_date ? getUtcTime(moment(val.end_date)) : null,
         "report_to": val.reporting_to ? val.reporting_to : "",
         "grade": val.grade ? val.grade : "",
         "pay_scale": val.pay_scale ? val.pay_scale : "",
@@ -8400,7 +8447,7 @@ var generateJSON$2 = function generateJSON(data, _key, person_id) {
         "type": val.type ? val.type : "",
         "title": val.title ? val.title : "",
         "note": val.notes ? val.notes : "",
-        "date": val.date ? moment(val.date).unix() : null,
+        "date": val.date ? getUtcTime(moment(val.date)) : null,
         "files": val.doc ? val.doc : []
       };
       awardsList.push(awardsData);
@@ -8948,7 +8995,7 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
           return idlabel.value === val.user;
         })[0] : {},
         "id_number": val.value,
-        "expiry_date": val.period[0].end ? moment.unix(val.period[0].end).format("YYYY-MM-DD") : null,
+        "expiry_date": val.period[0].end ? utcTOLocal(val.period[0].end, "YYYY-MM-DD") : null,
         "doc": val.files
       };
       identifier.push(identifierData);
@@ -9021,8 +9068,8 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
         primary_specialty: val.primary_specialty ? val.primary_specialty : false,
         select_role: getmasterOprions("role", val.role && ((_val$role = val.role) === null || _val$role === void 0 ? void 0 : _val$role.length) > 0 ? val.role[0]._id : null, masters)[0],
         status: val.active ? val.active : false,
-        start_date: val.period && ((_val$period = val.period) === null || _val$period === void 0 ? void 0 : _val$period.length) > 0 && val.period[0].start ? moment.unix(val.period[0].start).format("YYYY-MM-DD") : null,
-        end_date: val.period && ((_val$period2 = val.period) === null || _val$period2 === void 0 ? void 0 : _val$period2.length) > 0 && val.period[0].end ? moment.unix(val.period[0].end).format("YYYY-MM-DD") : null,
+        start_date: val.period && ((_val$period = val.period) === null || _val$period === void 0 ? void 0 : _val$period.length) > 0 && val.period[0].start ? utcTOLocal(val.period[0].start, "YYYY-MM-DD") : null,
+        end_date: val.period && ((_val$period2 = val.period) === null || _val$period2 === void 0 ? void 0 : _val$period2.length) > 0 && val.period[0].end ? utcTOLocal(val.period[0].end, "YYYY-MM-DD") : null,
         contact: contactListData(val.telecom, masters),
         doc: val.files ? val.files : [],
         // "telecom": contactList(val.contact),
@@ -9060,9 +9107,9 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
       var qualificationData = {
         "name": val.name ? val.name : "",
         "qualification_name": val.university_board ? val.university_board : "",
-        "issued_by": val.issue_date ? moment.unix(val.issue_date).format("YYYY-MM-DD") : null,
-        "start_date": val.valid_from ? moment.unix(val.valid_from).format("YYYY-MM-DD") : null,
-        "end_date": val.valid_to ? moment.unix(val.valid_to).format("YYYY-MM-DD") : null,
+        "issued_by": val.issue_date ? utcTOLocal(val.issue_date, "YYYY-MM-DD") : null,
+        "start_date": val.valid_from ? utcTOLocal(val.valid_from, "YYYY-MM-DD") : null,
+        "end_date": val.valid_to ? utcTOLocal(val.valid_to, "YYYY-MM-DD") : null,
         "doc": val.files ? val.files : []
       };
       qualificationList.push(qualificationData);
@@ -9089,10 +9136,10 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
         "organization": val.organization ? val.organization : "",
         "course_name": val.course_name ? val.course_name : "",
         "responsible_person": val.responsible_person ? val.responsible_person : "",
-        "course_start_date": val.course_start_date ? moment.unix(val.course_start_date).format("YYYY-MM-DD") : null,
-        "course_end_date": val.course_end_date ? moment.unix(val.course_end_date).format("YYYY-MM-DD") : null,
-        "certificate_issue_date": val.certificate_issued_date ? moment.unix(val.certificate_issued_date).format("YYYY-MM-DD") : null,
-        "certificate_expiry_date": val.certificate_expiry_date ? moment.unix(val.certificate_expiry_date).format("YYYY-MM-DD") : null,
+        "course_start_date": val.course_start_date ? utcTOLocal(val.course_start_date, "YYYY-MM-DD") : null,
+        "course_end_date": val.course_end_date ? utcTOLocal(val.course_end_date, "YYYY-MM-DD") : null,
+        "certificate_issue_date": val.certificate_issued_date ? utcTOLocal(val.certificate_issued_date, "YYYY-MM-DD") : null,
+        "certificate_expiry_date": val.certificate_expiry_date ? utcTOLocal(val.certificate_expiry_date, "YYYY-MM-DD") : null,
         "doc": val.files ? val.files : [],
         "contact": contactListData(val.training_contact_details, masters),
         "address": addressListData(val.training_address, masters)
@@ -9110,8 +9157,8 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
         "department": val.department ? val.department : "",
         "designation": val.designation ? val.designation : "",
         "role": val.role ? val.role : "",
-        "start_date": val.start_date ? moment.unix(val.start_date).format("YYYY-MM-DD") : null,
-        "end_date": val.end_date ? moment.unix(val.end_date).format("YYYY-MM-DD") : null,
+        "start_date": val.start_date ? utcTOLocal(val.start_date, "YYYY-MM-DD") : null,
+        "end_date": val.end_date ? utcTOLocal(val.end_date, "YYYY-MM-DD") : null,
         "reporting_to": val.report_to ? val.report_to : "",
         "grade": val.grade ? val.grade : "",
         "pay_scale": val.pay_scale ? val.pay_scale : "",
@@ -9134,7 +9181,7 @@ var generateReadJSON$4 = function generateReadJSON(data, masters) {
         "type": val.type ? val.type : "",
         "title": val.title ? val.title : "",
         "notes": val.note ? val.note : "",
-        "date": val.date ? moment.unix(val.date).format("YYYY-MM-DD") : null,
+        "date": val.date ? utcTOLocal(val.date, "YYYY-MM-DD") : null,
         "doc": val.files ? val.files : []
       };
       awardsList.push(awardsListData);
@@ -11858,8 +11905,8 @@ var timeslotList = function timeslotList(data) {
   if (data && data.length > 0) {
     data.map(function (val) {
       var timelot_obj = {
-        ovrfromtime: val.fromTime ? moment(val.fromTime).unix() : null,
-        ovrtotime: val.toTime ? moment(val.toTime).unix() : null // ovrfromtime: val.fromTime
+        ovrfromtime: val.fromTime ? getUtcTime(moment(val.fromTime)) : null,
+        ovrtotime: val.toTime ? getUtcTime(moment(val.toTime)) : null // ovrfromtime: val.fromTime
         //   ? parseFloat(val.fromTime.replace(":", "."))
         //   : null,
         // ovrtotime: val.toTime ? parseFloat(val.toTime.replace(":", ".")) : null,
@@ -11878,8 +11925,8 @@ var workday_timeslot = function workday_timeslot(data) {
   if (data && data.length > 0) {
     data.map(function (val) {
       var workday_timeslot_obj = {
-        openingtime: val.fromTime ? moment(val.fromTime).unix() : null,
-        closingtime: val.toTime ? moment(val.toTime).unix() : null // openingtime: val.fromTime
+        openingtime: val.fromTime ? getUtcTime(moment(val.fromTime)) : null,
+        closingtime: val.toTime ? getUtcTime(moment(val.toTime)) : null // openingtime: val.fromTime
         //   ? parseFloat(val.fromTime.replace(":", "."))
         //   : null,
         // closingtime: val.toTime
@@ -11915,8 +11962,8 @@ var generateJSON = function generateJSON(data, _key) {
     value: "",
     period: [{
       //_id: "",
-      start: moment().unix(),
-      end: moment().endOf("day").unix() //id: "",
+      start: getUtcTime(),
+      end: getUtcTime(moment().endOf("day")) //id: "",
 
     }] // assigner: "",
     // Type: "",
@@ -11944,8 +11991,8 @@ var generateJSON = function generateJSON(data, _key) {
         rank: val.priority.value.value ? val.priority.value.value : "",
         period: [{
           //_id: "",
-          start: moment().unix(),
-          end: moment().endOf("day").unix() //id: "",
+          start: getUtcTime(),
+          end: getUtcTime(moment().endOf("day")) //id: "",
 
         }],
         //id: "",
@@ -11985,7 +12032,7 @@ var generateJSON = function generateJSON(data, _key) {
     if (val.type === "singleDate") {
       final_obj = {
         overridetype: "Single",
-        ovrfromdate: val.selectDate ? moment(val.selectDate).unix() : null,
+        ovrfromdate: val.selectDate ? getUtcTime(moment(val.selectDate)) : null,
         ovrtodate: 0,
         operationTime: [{
           ovrday: "Monday",
@@ -11996,8 +12043,8 @@ var generateJSON = function generateJSON(data, _key) {
     } else if (val.type === "dateRange") {
       final_obj = {
         overridetype: "Multiple",
-        ovrfromdate: val.fromDate ? moment(val.fromDate).unix() : null,
-        ovrtodate: val.toDate ? moment(val.toDate).unix() : null,
+        ovrfromdate: val.fromDate ? getUtcTime(moment(val.fromDate)) : null,
+        ovrtodate: val.toDate ? getUtcTime(moment(val.toDate)) : null,
         operationTime: dayslotlist(val.daySlots)
       };
       overRideArr.push(final_obj);
@@ -14689,7 +14736,7 @@ var queries$i = {
       "doc": _objectSpread2(_objectSpread2({
         // "_id": "string",
         // "CalYear": "number",
-        "CalDate": data.date ? moment(data.date).unix() : null,
+        "CalDate": data.date ? getUtcTime(moment(data.date)) : null,
         "CalDay": data.date ? moment(data.date).format("dddd") : "",
         "HolidayType": data.holiday_type,
         "HoidayReason": data.holiday_reason,
@@ -15143,7 +15190,7 @@ var HOLIDAY_READ = createAsyncThunk("holidaySlice/holidy_list", /*#__PURE__*/_as
           data.result.map(function (val) {
             if (val._key) {
               arry.push({
-                "date": val.CalDate ? moment.unix(val.CalDate).format("DD-MM-YY") : null,
+                "date": val.CalDate ? utcTOLocal(val.CalDate, "DD-MM-YY") : null,
                 "CalDate": val.CalDate ? val.CalDate : null,
                 "day": val.CalDay ? val.CalDay : "",
                 "holiday_reason": val.HoidayReason ? val.HoidayReason : "",
@@ -17317,7 +17364,7 @@ var DfltFreqbyPatAttribFun = function DfltFreqbyPatAttribFun(val, dataval) {
 };
 
 var generateDrugMasterJSON = function generateDrugMasterJSON(data, _key, draft) {
-  var _data$phDrugMaster, _data$phDrugMaster$ro, _data$phDrugMaster2, _data$alternateDrugs, _data$phDrugMaster4, _data$availableStreng, _data$phDrugMaster5, _data$instructions, _data$frequencyRules, _data$dispensesRules, _data$phDrugMaster6, _data$phDrugMaster6$s, _data$mappedStack, _data$phDrugMaster$co, _data$phDrugMaster8, _data$phDrugMaster$sh, _data$phDrugMaster9, _data$phDrugMaster$lo, _data$phDrugMaster10, _data$phDrugMaster$in, _data$phDrugMaster11, _data$phDrugMaster$dr, _data$phDrugMaster12, _data$phDrugMaster$cl, _data$phDrugMaster13, _data$phDrugMaster13$, _data$phDrugMaster$ty, _data$phDrugMaster14, _data$phDrugMaster14$, _data$phDrugMaster$ca, _data$phDrugMaster15, _data$phDrugMaster15$, _data$phDrugMaster16, _data$phDrugMaster16$, _data$phDrugMaster17, _data$phDrugMaster18, _data$phDrugMaster18$, _data$phDrugMaster19, _data$phDrugMaster19$, _data$phDrugMaster20, _data$phDrugMaster21, _data$phDrugMaster21$, _data$drugOtherAttrib, _data$phDrugMaster22, _data$drugOtherAttrib2, _data$drugOtherAttrib3, _data$phDrugMaster23, _data$drugOtherAttrib4, _data$drugOtherAttrib5, _data$phDrugMaster24, _data$drugOtherAttrib6, _data$drugOtherAttrib7, _data$phDrugMaster25, _data$drugOtherAttrib8, _data$drugOtherAttrib9, _data$phDrugMaster26, _data$drugOtherAttrib10, _data$status$status$v, _data$status, _data$status$status, _data$status2, _moment$unix, _data$status3, _data$status4, _moment$unix2, _data$status5, _data$status$reason, _data$status6;
+  var _data$phDrugMaster, _data$phDrugMaster$ro, _data$phDrugMaster2, _data$alternateDrugs, _data$phDrugMaster4, _data$availableStreng, _data$phDrugMaster5, _data$instructions, _data$frequencyRules, _data$dispensesRules, _data$phDrugMaster6, _data$phDrugMaster6$s, _data$mappedStack, _data$phDrugMaster$co, _data$phDrugMaster8, _data$phDrugMaster$sh, _data$phDrugMaster9, _data$phDrugMaster$lo, _data$phDrugMaster10, _data$phDrugMaster$in, _data$phDrugMaster11, _data$phDrugMaster$dr, _data$phDrugMaster12, _data$phDrugMaster$cl, _data$phDrugMaster13, _data$phDrugMaster13$, _data$phDrugMaster$ty, _data$phDrugMaster14, _data$phDrugMaster14$, _data$phDrugMaster$ca, _data$phDrugMaster15, _data$phDrugMaster15$, _data$phDrugMaster16, _data$phDrugMaster16$, _data$phDrugMaster17, _data$phDrugMaster18, _data$phDrugMaster18$, _data$phDrugMaster19, _data$phDrugMaster19$, _data$phDrugMaster20, _data$phDrugMaster21, _data$phDrugMaster21$, _data$drugOtherAttrib, _data$phDrugMaster22, _data$drugOtherAttrib2, _data$drugOtherAttrib3, _data$phDrugMaster23, _data$drugOtherAttrib4, _data$drugOtherAttrib5, _data$phDrugMaster24, _data$drugOtherAttrib6, _data$drugOtherAttrib7, _data$phDrugMaster25, _data$drugOtherAttrib8, _data$drugOtherAttrib9, _data$phDrugMaster26, _data$drugOtherAttrib10, _data$status$status$v, _data$status, _data$status$status, _data$status2, _getUtcTime, _data$status3, _data$status4, _getUtcTime2, _data$status5, _data$status$reason, _data$status6;
 
   var statusactive = true;
   var filter = {};
@@ -17530,8 +17577,8 @@ var generateDrugMasterJSON = function generateDrugMasterJSON(data, _key, draft)
       "DrugDispRules": DrugDispRulesData,
       //STATUS
       "Status": (_data$status$status$v = data === null || data === void 0 ? void 0 : (_data$status = data.status) === null || _data$status === void 0 ? void 0 : (_data$status$status = _data$status.status) === null || _data$status$status === void 0 ? void 0 : _data$status$status.value) !== null && _data$status$status$v !== void 0 ? _data$status$status$v : "",
-      "EffectiveFrom": data !== null && data !== void 0 && (_data$status2 = data.status) !== null && _data$status2 !== void 0 && _data$status2.effectiveFrom ? (_moment$unix = moment(data === null || data === void 0 ? void 0 : (_data$status3 = data.status) === null || _data$status3 === void 0 ? void 0 : _data$status3.effectiveFrom).unix()) !== null && _moment$unix !== void 0 ? _moment$unix : null : null,
-      "EffectiveTo": data !== null && data !== void 0 && (_data$status4 = data.status) !== null && _data$status4 !== void 0 && _data$status4.effectiveTo ? (_moment$unix2 = moment(data === null || data === void 0 ? void 0 : (_data$status5 = data.status) === null || _data$status5 === void 0 ? void 0 : _data$status5.effectiveTo).unix()) !== null && _moment$unix2 !== void 0 ? _moment$unix2 : null : null,
+      "EffectiveFrom": data !== null && data !== void 0 && (_data$status2 = data.status) !== null && _data$status2 !== void 0 && _data$status2.effectiveFrom ? (_getUtcTime = getUtcTime(moment(data === null || data === void 0 ? void 0 : (_data$status3 = data.status) === null || _data$status3 === void 0 ? void 0 : _data$status3.effectiveFrom))) !== null && _getUtcTime !== void 0 ? _getUtcTime : null : null,
+      "EffectiveTo": data !== null && data !== void 0 && (_data$status4 = data.status) !== null && _data$status4 !== void 0 && _data$status4.effectiveTo ? (_getUtcTime2 = getUtcTime(moment(data === null || data === void 0 ? void 0 : (_data$status5 = data.status) === null || _data$status5 === void 0 ? void 0 : _data$status5.effectiveTo))) !== null && _getUtcTime2 !== void 0 ? _getUtcTime2 : null : null,
       "InactiveReason": (_data$status$reason = data === null || data === void 0 ? void 0 : (_data$status6 = data.status) === null || _data$status6 === void 0 ? void 0 : _data$status6.reason) !== null && _data$status$reason !== void 0 ? _data$status$reason : "",
       "statusactive": statusactive,
       // save type
@@ -17822,8 +17869,8 @@ var readDrugMasterJSON = function readDrugMasterJSON(data, state) {
     "SourceOfDrugOrderCatalog": data === null || data === void 0 ? void 0 : data.SourceOfDrugOrderCatalog,
     "status": {
       "status": data !== null && data !== void 0 && data.Status ? singelOptionComLable(data === null || data === void 0 ? void 0 : data.Status, state === null || state === void 0 ? void 0 : (_state$drug_master11 = state.drug_master) === null || _state$drug_master11 === void 0 ? void 0 : (_state$drug_master11$ = _state$drug_master11.data) === null || _state$drug_master11$ === void 0 ? void 0 : _state$drug_master11$.status) : [],
-      "effectiveFrom": data !== null && data !== void 0 && data.EffectiveFrom ? moment.unix(data === null || data === void 0 ? void 0 : data.EffectiveFrom).format("YYYY-MM-DD") : null,
-      "effectiveTo": data !== null && data !== void 0 && data.EffectiveTo ? moment.unix(data === null || data === void 0 ? void 0 : data.EffectiveTo).format("YYYY-MM-DD") : null,
+      "effectiveFrom": data !== null && data !== void 0 && data.EffectiveFrom ? utcTOLocal(data === null || data === void 0 ? void 0 : data.EffectiveFrom, "YYYY-MM-DD") : null,
+      "effectiveTo": data !== null && data !== void 0 && data.EffectiveTo ? utcTOLocal(data === null || data === void 0 ? void 0 : data.EffectiveTo, "YYYY-MM-DD") : null,
       "reason": (_data$InactiveReason = data === null || data === void 0 ? void 0 : data.InactiveReason) !== null && _data$InactiveReason !== void 0 ? _data$InactiveReason : ""
     },
     "drugOtherAttributes": {
@@ -19066,8 +19113,8 @@ var getAvailability = function getAvailability(data) {
       apptreqd: v.appointment,
       apptDurnInMinutes: parseInt(v.duration),
       perfOrganizationEntity: v.entity_type.value,
-      EffFrDate: v.effective_from ? moment(v.effective_from).unix() : null,
-      EffToDate: v.effective_to ? moment(v.effective_to).unix() : null
+      EffFrDate: v.effective_from ? getUtcTime(moment(v.effective_from)) : null,
+      EffToDate: v.effective_to ? getUtcTime(moment(v.effective_to)) : null
     };
   });
   return arr;
@@ -19454,8 +19501,8 @@ var generatefaciltity = function generatefaciltity(data, state) {
       } : null,
       appointment: v.apptreqd,
       duration: v.apptDurnInMinutes,
-      effective_from: new Date(moment.unix(v.EffFrDate)).toLocaleDateString(),
-      effective_to: new Date(moment.unix(v.EffToDate)).toLocaleDateString()
+      effective_from: new Date(utcTOLocal(v.EffFrDate)).toLocaleDateString(),
+      effective_to: new Date(utcTOLocal(v.EffToDate)).toLocaleDateString()
     };
   });
   return facilityArr;
@@ -20721,8 +20768,8 @@ var upsertData = function upsertData(payload) {
       "ResourceType": (_payload$basicDetails4 = payload === null || payload === void 0 ? void 0 : (_payload$basicDetails5 = payload.basicDetails) === null || _payload$basicDetails5 === void 0 ? void 0 : (_payload$basicDetails6 = _payload$basicDetails5.resource_type) === null || _payload$basicDetails6 === void 0 ? void 0 : _payload$basicDetails6.value) !== null && _payload$basicDetails4 !== void 0 ? _payload$basicDetails4 : "",
       "ResourceRole": (_payload$basicDetails7 = payload === null || payload === void 0 ? void 0 : (_payload$basicDetails8 = payload.basicDetails) === null || _payload$basicDetails8 === void 0 ? void 0 : (_payload$basicDetails9 = _payload$basicDetails8.resource_role) === null || _payload$basicDetails9 === void 0 ? void 0 : _payload$basicDetails9.value) !== null && _payload$basicDetails7 !== void 0 ? _payload$basicDetails7 : "",
       "Resource_Criteria": (_ruleSet = ruleSet) !== null && _ruleSet !== void 0 ? _ruleSet : [],
-      "EffectiveFrom": moment(payload.scheduledPeriod.start_date).unix(),
-      "EffectiveTo": payload.scheduledPeriod.end_date ? moment(payload.scheduledPeriod.end_date).unix() : 0,
+      "EffectiveFrom": getUtcTime(moment(payload.scheduledPeriod.start_date)),
+      "EffectiveTo": payload.scheduledPeriod.end_date ? getUtcTime(moment(payload.scheduledPeriod.end_date)) : 0,
       "Schedulemode": (_payload$scheduledPer = payload === null || payload === void 0 ? void 0 : (_payload$scheduledPer2 = payload.scheduledPeriod) === null || _payload$scheduledPer2 === void 0 ? void 0 : (_payload$scheduledPer3 = _payload$scheduledPer2.schedule_mode) === null || _payload$scheduledPer3 === void 0 ? void 0 : _payload$scheduledPer3.value) !== null && _payload$scheduledPer !== void 0 ? _payload$scheduledPer : "",
       "scheduleappmang": parseInt((_payload$scheduledPer4 = payload === null || payload === void 0 ? void 0 : (_payload$scheduledPer5 = payload.scheduledPeriod) === null || _payload$scheduledPer5 === void 0 ? void 0 : _payload$scheduledPer5.availablity_management) !== null && _payload$scheduledPer4 !== void 0 ? _payload$scheduledPer4 : 0),
       "Remarks": "",
@@ -20895,8 +20942,8 @@ var makeJson = function makeJson(data) {
     var _val$ResourceType, _val$ResourceRole$dis, _val$ResourceRole, _val$ResourceRole2;
 
     return _objectSpread2(_objectSpread2({}, val), {}, {
-      start_date: moment.unix(val.EffectiveFrom).format("DD-MM-YYYY"),
-      end_date: val.EffectiveTo ? moment.unix(val.EffectiveTo).format("DD-MM-YYYY") : "",
+      start_date: utcTOLocal(val.EffectiveFrom, "DD-MM-YYYY"),
+      end_date: val.EffectiveTo ? utcTOLocal(val.EffectiveTo, "DD-MM-YYYY") : "",
       resource_type: val === null || val === void 0 ? void 0 : (_val$ResourceType = val.ResourceType) === null || _val$ResourceType === void 0 ? void 0 : _val$ResourceType.display,
       resource_role: (_val$ResourceRole$dis = val === null || val === void 0 ? void 0 : (_val$ResourceRole = val.ResourceRole) === null || _val$ResourceRole === void 0 ? void 0 : _val$ResourceRole.display) !== null && _val$ResourceRole$dis !== void 0 ? _val$ResourceRole$dis : val === null || val === void 0 ? void 0 : (_val$ResourceRole2 = val.ResourceRole) === null || _val$ResourceRole2 === void 0 ? void 0 : _val$ResourceRole2.shortdesc
     });
@@ -21329,11 +21376,12 @@ var ALL_PRACTITIONER = createAsyncThunk("scheduleManagementApiSlice/allPractitio
           data = _context2.sent;
           arr = [];
           data && data.result.map(function (val) {
-            var _val$name$0$prefix$0$, _val$name, _val$name$, _val$name$$prefix, _val$name$$prefix$, _val$name$$prefix$$co, _val$name$$prefix$$co2, _val$name$0$text, _val$name2, _val$name2$, _val$name$0$given, _val$name3, _val$name$0$family, _val$name4, _val$name4$, _val$name$0$suffix$0$, _val$name5, _val$name5$, _val$name5$$suffix, _val$name5$$suffix$, _val$name5$$suffix$$c, _val$name5$$suffix$$c2;
+            var _val$name;
 
             arr.push({
               value: val._id,
-              label: ((_val$name$0$prefix$0$ = val === null || val === void 0 ? void 0 : (_val$name = val.name) === null || _val$name === void 0 ? void 0 : (_val$name$ = _val$name[0]) === null || _val$name$ === void 0 ? void 0 : (_val$name$$prefix = _val$name$.prefix) === null || _val$name$$prefix === void 0 ? void 0 : (_val$name$$prefix$ = _val$name$$prefix[0]) === null || _val$name$$prefix$ === void 0 ? void 0 : (_val$name$$prefix$$co = _val$name$$prefix$.coding) === null || _val$name$$prefix$$co === void 0 ? void 0 : (_val$name$$prefix$$co2 = _val$name$$prefix$$co[0]) === null || _val$name$$prefix$$co2 === void 0 ? void 0 : _val$name$$prefix$$co2.display) !== null && _val$name$0$prefix$0$ !== void 0 ? _val$name$0$prefix$0$ : "") + " " + ((_val$name$0$text = val === null || val === void 0 ? void 0 : (_val$name2 = val.name) === null || _val$name2 === void 0 ? void 0 : (_val$name2$ = _val$name2[0]) === null || _val$name2$ === void 0 ? void 0 : _val$name2$.text) !== null && _val$name$0$text !== void 0 ? _val$name$0$text : "") + " " + ((_val$name$0$given = val === null || val === void 0 ? void 0 : (_val$name3 = val.name) === null || _val$name3 === void 0 ? void 0 : _val$name3[0].given) !== null && _val$name$0$given !== void 0 ? _val$name$0$given : "") + " " + ((_val$name$0$family = val === null || val === void 0 ? void 0 : (_val$name4 = val.name) === null || _val$name4 === void 0 ? void 0 : (_val$name4$ = _val$name4[0]) === null || _val$name4$ === void 0 ? void 0 : _val$name4$.family) !== null && _val$name$0$family !== void 0 ? _val$name$0$family : "") + " " + ((_val$name$0$suffix$0$ = val === null || val === void 0 ? void 0 : (_val$name5 = val.name) === null || _val$name5 === void 0 ? void 0 : (_val$name5$ = _val$name5[0]) === null || _val$name5$ === void 0 ? void 0 : (_val$name5$$suffix = _val$name5$.suffix) === null || _val$name5$$suffix === void 0 ? void 0 : (_val$name5$$suffix$ = _val$name5$$suffix[0]) === null || _val$name5$$suffix$ === void 0 ? void 0 : (_val$name5$$suffix$$c = _val$name5$$suffix$.coding) === null || _val$name5$$suffix$$c === void 0 ? void 0 : (_val$name5$$suffix$$c2 = _val$name5$$suffix$$c[0]) === null || _val$name5$$suffix$$c2 === void 0 ? void 0 : _val$name5$$suffix$$c2.display) !== null && _val$name$0$suffix$0$ !== void 0 ? _val$name$0$suffix$0$ : ""),
+              label: makeName(val === null || val === void 0 ? void 0 : (_val$name = val.name) === null || _val$name === void 0 ? void 0 : _val$name[0]),
+              //(val?.name?.[0]?.prefix?.[0]?.coding?.[0]?.display??"")+ " " + (val?.name?.[0]?.text??"") + " " + (val?.name?.[0].given??"") + " " + (val?.name?.[0]?.family??"") + " " + (val?.name?.[0]?.suffix?.[0]?.coding?.[0]?.display??""),
               // label:
               //   val.name.length > 0
               //     ? val.name[0].prefix.length > 0
@@ -21726,7 +21774,7 @@ var queries$c = {
       db_name: dbName,
       entity: "Organization",
       // filter: "'CodingMaster/11898' IN Organization.OrgType",
-      filter: "Organization.ParentOrgID ==[] && Organization.activestatus==true ",
+      filter: "Organization.ParentOrgID ==[] && Organization.activestatus==true &&  Organization.isExternal==".concat(type.isexternal),
       // return_fields: "MERGE(Organization,{Organization:(FOR org IN Organization  FILTER Organization.id IN org.ParentOrgID AND 'CodingMaster/11899' IN org.OrgType   RETURN MERGE(org,{facility:(FOR fac IN Organization FILTER 'CodingMaster/11058' IN fac.OrgType AND org.id IN fac.ParentOrgID RETURN fac)}) )})",
       return_fields: "MERGE(Organization,{Organization:(FOR org IN Organization  FILTER Organization.id IN org.ParentOrgID  RETURN MERGE(org,{facility:(FOR fac IN Organization FILTER org.id IN fac.ParentOrgID RETURN fac)}) )})"
     };
@@ -21740,7 +21788,7 @@ var queries$c = {
       return_fields: "MERGE(CodeableConceptMaster,{coding:(FOR cod IN TO_ARRAY(CodeableConceptMaster.coding) RETURN DOCUMENT(cod))})"
     };
   },
-  getParentEntity: function getParentEntity() {
+  getParentEntityFull: function getParentEntityFull() {
     return {
       db_name: dbName,
       entity: "Organization",
@@ -21749,6 +21797,23 @@ var queries$c = {
       return_fields: "{_id:Organization._id,_key:Organization._key,id:Organization.id,name:Organization.name,alias:Organization.alias}"
     };
   },
+  getParentEntity: function getParentEntity(type) {
+    // return {
+    // 	db_name: dbName,
+    // 	entity: "Organization",
+    // 	sort: "Organization.name",
+    // 	filter: `Organization.activestatus==true AND Organization.active==true && Organization.isExternal==${type.isexternal} && Organization.OrgType === '${type.entityType}'`,
+    // 	return_fields:
+    // 		"{_id:Organization._id,_key:Organization._key,id:Organization.id,name:Organization.name,alias:Organization.alias}",
+    // };
+    return {
+      "db_name": dbName,
+      "entity": "Organization",
+      "sort": "Organization.name",
+      "filter": "Organization.activestatus==true AND Organization.active==true && Organization.isExternal==".concat(type.isexternal, " && DOCUMENT(Organization.OrgType)[*].code ANY == '").concat(type.entityType, "'"),
+      "return_fields": "{OrgType: Organization.OrgType, _id:Organization._id,_key:Organization._key,id:Organization.id,name:Organization.name,alias:Organization.alias}"
+    };
+  },
   getLevelOfCare: function getLevelOfCare() {
     return {
       db_name: dbName,
@@ -22083,7 +22148,7 @@ var ReadTreeDetailJson = function ReadTreeDetailJson(data, parentOrgName) {
   var obj = {};
 
   if (data) {
-    var _data$name, _data$entitycode, _data$ParentOrgID, _data$levelofcareid$d, _data$levelofcareid, _data$levelofcareid$l, _data$levelofcareid2, _ref2, _data$address, _data$address$, _data$address2, _data$address2$, _data$address2$$city, _data$address3, _data$address3$, _data$address3$$distr, _data$address4, _data$address4$, _data$address4$$state, _data$address5, _data$address5$, _data$address5$$posta, _data$address6, _data$address6$, _data$address6$$count, _data$contact$, _data$contact$$name$, _data$contact$$name$$, _data$contact$2, _data$contact$2$name$, _data$contact$3, _data$contact$3$name$, _data$contact$4, _data$contact$4$name$, _data$contact$5, _data$contact$5$name$, _data$contact$5$name$2, _data$contact$0$desig, _data$contact, _data$contact$6, _data$contact$6$desig, _data$logo$, _getpersondetails, _data$contact2;
+    var _data$name, _data$entitycode, _data$ParentOrgID, _data$levelofcareid$d, _data$levelofcareid, _data$levelofcareid$l, _data$levelofcareid2, _ref2, _data$address, _data$address$, _data$address2, _data$address2$, _data$address2$$city, _data$address3, _data$address3$, _data$address3$$distr, _data$address4, _data$address4$, _data$address4$$state, _data$address5, _data$address5$, _data$address5$$posta, _data$address6, _data$address6$, _data$address6$$count, _data$contact$, _data$contact$$name$, _data$contact$$name$$, _data$contact$2, _data$contact$2$name$, _data$contact$3, _data$contact$3$name$, _data$contact$4, _data$contact$4$name$, _data$contact$5, _data$contact$5$name$, _data$contact$5$name$2, _data$contact$0$desig, _data$contact, _data$contact$6, _data$contact$6$desig, _data$logo$, _getpersondetails, _data$contact2, _data$isExternal;
 
     obj = {
       entityName: (_data$name = data === null || data === void 0 ? void 0 : data.name) !== null && _data$name !== void 0 ? _data$name : "",
@@ -22100,7 +22165,8 @@ var ReadTreeDetailJson = function ReadTreeDetailJson(data, parentOrgName) {
       status: data === null || data === void 0 ? void 0 : data.active,
       log: data === null || data === void 0 ? void 0 : (_data$logo$ = data.logo[0]) === null || _data$logo$ === void 0 ? void 0 : _data$logo$.fileid,
       specialtyDetails: specialtyDetailsarr,
-      contact_person_name: (_getpersondetails = getpersondetails((data === null || data === void 0 ? void 0 : (_data$contact2 = data.contact) === null || _data$contact2 === void 0 ? void 0 : _data$contact2.length) > 0 ? data === null || data === void 0 ? void 0 : data.contact : null)) !== null && _getpersondetails !== void 0 ? _getpersondetails : null
+      contact_person_name: (_getpersondetails = getpersondetails((data === null || data === void 0 ? void 0 : (_data$contact2 = data.contact) === null || _data$contact2 === void 0 ? void 0 : _data$contact2.length) > 0 ? data === null || data === void 0 ? void 0 : data.contact : null)) !== null && _getpersondetails !== void 0 ? _getpersondetails : null,
+      external: (_data$isExternal = data === null || data === void 0 ? void 0 : data.isExternal) !== null && _data$isExternal !== void 0 ? _data$isExternal : false
     };
   }
 
@@ -22109,7 +22175,7 @@ var ReadTreeDetailJson = function ReadTreeDetailJson(data, parentOrgName) {
 
 var generateJson$7 = {
   insert_json: function insert_json(data, key) {
-    var _data$Identification, _data$Alias, _data$Address, _data$Contact, _data$ContactPersonDe, _data$specialtyDetail, _data$ParentEntity, _data$ParentEntity2, _data$LevelOfCare, _data$imageDetails$, _data$imageDetails$2, _data$imageDetails$3, _data$imageDetails$4;
+    var _data$Identification, _data$Alias, _data$Address, _data$Contact, _data$ContactPersonDe, _data$specialtyDetail, _data$external, _data$ParentEntity, _data$ParentEntity2, _data$LevelOfCare, _data$imageDetails$, _data$imageDetails$2, _data$imageDetails$3, _data$imageDetails$4;
 
     var identifierArr = data === null || data === void 0 ? void 0 : (_data$Identification = data.Identification) === null || _data$Identification === void 0 ? void 0 : _data$Identification.map(function (v, i) {
       var _v$use;
@@ -22121,8 +22187,8 @@ var generateJson$7 = {
           user: v === null || v === void 0 ? void 0 : (_v$use2 = v.use) === null || _v$use2 === void 0 ? void 0 : _v$use2.value,
           value: v === null || v === void 0 ? void 0 : v.idnumber,
           period: [{
-            start: moment(v === null || v === void 0 ? void 0 : v.startdate).unix(),
-            end: moment(v === null || v === void 0 ? void 0 : v.enddate).unix(),
+            start: getUtcTime(moment(v === null || v === void 0 ? void 0 : v.startdate)),
+            end: getUtcTime(moment(v === null || v === void 0 ? void 0 : v.enddate)),
             id: 0
           }],
           Type: v === null || v === void 0 ? void 0 : (_v$idtype = v.idtype) === null || _v$idtype === void 0 ? void 0 : _v$idtype.value
@@ -22135,8 +22201,8 @@ var generateJson$7 = {
       return {
         aliasType: v === null || v === void 0 ? void 0 : (_v$aliastype = v.aliastype) === null || _v$aliastype === void 0 ? void 0 : _v$aliastype.value,
         aliasDesc: v === null || v === void 0 ? void 0 : v.aliasname,
-        aliasStart: moment(v === null || v === void 0 ? void 0 : v.startdate).unix(),
-        aliasEnd: moment(v === null || v === void 0 ? void 0 : v.enddate).unix()
+        aliasStart: getUtcTime(moment(v === null || v === void 0 ? void 0 : v.startdate)),
+        aliasEnd: getUtcTime(moment(v === null || v === void 0 ? void 0 : v.enddate))
       };
     });
     var addressArr = data === null || data === void 0 ? void 0 : (_data$Address = data.Address) === null || _data$Address === void 0 ? void 0 : _data$Address.map(function (val, i) {
@@ -22208,8 +22274,8 @@ var generateJson$7 = {
     var specialtyDetailsArr = data === null || data === void 0 ? void 0 : (_data$specialtyDetail = data.specialtyDetails) === null || _data$specialtyDetail === void 0 ? void 0 : _data$specialtyDetail.map(function (val, i) {
       return {
         specialty: val === null || val === void 0 ? void 0 : val.dropdown.id,
-        effFrom: moment(val === null || val === void 0 ? void 0 : val.fromDate).unix(),
-        effTo: moment(val === null || val === void 0 ? void 0 : val.toDate).unix(),
+        effFrom: getUtcTime(moment(val === null || val === void 0 ? void 0 : val.fromDate)),
+        effTo: getUtcTime(moment(val === null || val === void 0 ? void 0 : val.toDate)),
         external: false
       };
     });
@@ -22247,6 +22313,7 @@ var generateJson$7 = {
         contact: contactpersondetailsArr,
         specialtyDetails: specialtyDetailsArr
       }, id), {}, {
+        isExternal: (_data$external = data === null || data === void 0 ? void 0 : data.external) !== null && _data$external !== void 0 ? _data$external : false,
         ParentOrgID: data !== null && data !== void 0 && (_data$ParentEntity = data.ParentEntity) !== null && _data$ParentEntity !== void 0 && _data$ParentEntity.value ? [data === null || data === void 0 ? void 0 : (_data$ParentEntity2 = data.ParentEntity) === null || _data$ParentEntity2 === void 0 ? void 0 : _data$ParentEntity2.value] : [],
         OrgType: [data.EntityType.value],
         levelofcareid: data === null || data === void 0 ? void 0 : (_data$LevelOfCare = data.LevelOfCare) === null || _data$LevelOfCare === void 0 ? void 0 : _data$LevelOfCare.value,
@@ -22266,15 +22333,17 @@ var generateJson$7 = {
 };
 var generateReadJson$2 = {
   read_json: function read_json(data, Parentget) {
-    var _data$identifier, _data$alias, _data$address, _data$telecom, _data$contact, _data$OrgType$, _data$OrgType$2, _data$ParentOrgID, _data$levelofcareid, _data$levelofcareid2, _data$logo$, _data$logo$2, _data$logo$3, _data$logo$4, _data$logo$5;
+    var _data$identifier, _data$alias, _data$address, _data$telecom, _data$contact, _data$OrgType$, _data$OrgType$2, _data$OrgType$3, _data$ParentOrgID, _data$levelofcareid, _data$levelofcareid2, _data$isExternal, _data$logo$, _data$logo$2, _data$logo$3, _data$logo$4, _data$logo$5;
 
     var IdentificationArr = data === null || data === void 0 ? void 0 : (_data$identifier = data.identifier) === null || _data$identifier === void 0 ? void 0 : _data$identifier.map(function (v, i) {
       var _v$period$, _v$period$2, _v$user, _v$user2, _v$Type, _v$Type2;
 
       // IdentificationArr readdd
       return {
-        startdate: moment().utc(v === null || v === void 0 ? void 0 : (_v$period$ = v.period[0]) === null || _v$period$ === void 0 ? void 0 : _v$period$.start, "DD-MM-YYYY")._d,
-        enddate: moment().utc(v === null || v === void 0 ? void 0 : (_v$period$2 = v.period[0]) === null || _v$period$2 === void 0 ? void 0 : _v$period$2.end, "DD-MM-YYYY")._d,
+        startdate: moment.utc(moment.unix(v === null || v === void 0 ? void 0 : (_v$period$ = v.period[0]) === null || _v$period$ === void 0 ? void 0 : _v$period$.start)).local()._d,
+        // startdate: moment().utc(v?.period[0]?.start, "DD-MM-YYYY")._d,
+        enddate: moment.utc(moment.unix(v === null || v === void 0 ? void 0 : (_v$period$2 = v.period[0]) === null || _v$period$2 === void 0 ? void 0 : _v$period$2.end)).local()._d,
+        // enddate: moment().utc(v?.period[0]?.end, "DD-MM-YYYY")._d,
         use: {
           title: v === null || v === void 0 ? void 0 : (_v$user = v.user) === null || _v$user === void 0 ? void 0 : _v$user.display,
           value: v === null || v === void 0 ? void 0 : (_v$user2 = v.user) === null || _v$user2 === void 0 ? void 0 : _v$user2._id
@@ -22417,13 +22486,15 @@ var generateReadJson$2 = {
 
       // specialtyDetailsarr
       return {
-        effFrom: moment(moment.unix(val === null || val === void 0 ? void 0 : val.effFrom)._d).format("DD-MM-YYYY"),
-        effTo: moment(moment.unix(val === null || val === void 0 ? void 0 : val.effTo)._d).format("DD-MM-YYYY"),
+        effFrom: utcTOLocal(val === null || val === void 0 ? void 0 : val.effFrom, "DD-MM-YYYY"),
+        effTo: utcTOLocal(val === null || val === void 0 ? void 0 : val.effTo, "DD-MM-YYYY"),
         specialty: val === null || val === void 0 ? void 0 : (_val$specialty = val.specialty) === null || _val$specialty === void 0 ? void 0 : _val$specialty.display,
         code: val === null || val === void 0 ? void 0 : (_val$specialty2 = val.specialty) === null || _val$specialty2 === void 0 ? void 0 : _val$specialty2.code,
         specialty_id: val === null || val === void 0 ? void 0 : (_val$specialty3 = val.specialty) === null || _val$specialty3 === void 0 ? void 0 : _val$specialty3._id,
-        fromDate: moment.unix(val === null || val === void 0 ? void 0 : val.effFrom)._d,
-        toDate: moment.unix(val.effTo)._d,
+        fromDate: moment(utcTOLocal(val === null || val === void 0 ? void 0 : val.effFrom, "DD-MM-YYYY"))._d,
+        // moment(val?.effFrom)._d,
+        toDate: moment(utcTOLocal(val === null || val === void 0 ? void 0 : val.effTo, "DD-MM-YYYY"))._d,
+        //moment(val.effTo)._d,
         dropdown: {
           label: (val === null || val === void 0 ? void 0 : (_val$specialty4 = val.specialty) === null || _val$specialty4 === void 0 ? void 0 : _val$specialty4.display) + " (" + (val === null || val === void 0 ? void 0 : (_val$specialty5 = val.specialty) === null || _val$specialty5 === void 0 ? void 0 : _val$specialty5.code) + ")",
           value: val === null || val === void 0 ? void 0 : (_val$specialty6 = val.specialty) === null || _val$specialty6 === void 0 ? void 0 : _val$specialty6.code,
@@ -22437,7 +22508,8 @@ var generateReadJson$2 = {
       status: data === null || data === void 0 ? void 0 : data.active,
       EntityType_: {
         title: data === null || data === void 0 ? void 0 : (_data$OrgType$ = data.OrgType[0]) === null || _data$OrgType$ === void 0 ? void 0 : _data$OrgType$.display,
-        value: data === null || data === void 0 ? void 0 : (_data$OrgType$2 = data.OrgType[0]) === null || _data$OrgType$2 === void 0 ? void 0 : _data$OrgType$2._id
+        value: data === null || data === void 0 ? void 0 : (_data$OrgType$2 = data.OrgType[0]) === null || _data$OrgType$2 === void 0 ? void 0 : _data$OrgType$2._id,
+        code: data === null || data === void 0 ? void 0 : (_data$OrgType$3 = data.OrgType[0]) === null || _data$OrgType$3 === void 0 ? void 0 : _data$OrgType$3.code
       },
       ParentEntity_: (data === null || data === void 0 ? void 0 : (_data$ParentOrgID = data.ParentOrgID) === null || _data$ParentOrgID === void 0 ? void 0 : _data$ParentOrgID.length) > 0 ? Parentget === null || Parentget === void 0 ? void 0 : Parentget.filter(function (val) {
         return (val === null || val === void 0 ? void 0 : val.value) === (data === null || data === void 0 ? void 0 : data.ParentOrgID[0]);
@@ -22455,6 +22527,7 @@ var generateReadJson$2 = {
       Contact_: ContactArr,
       ContactPersonDetails_: ContactPersonDetailsArr,
       specialtyDetails: specialtyDetailsarr,
+      external: (_data$isExternal = data === null || data === void 0 ? void 0 : data.isExternal) !== null && _data$isExternal !== void 0 ? _data$isExternal : false,
       imageDetails_: data !== null && data !== void 0 && (_data$logo$ = data.logo[0]) !== null && _data$logo$ !== void 0 && _data$logo$.fileid ? [{
         fileid: data === null || data === void 0 ? void 0 : (_data$logo$2 = data.logo[0]) === null || _data$logo$2 === void 0 ? void 0 : _data$logo$2.fileid,
         filetype: data === null || data === void 0 ? void 0 : (_data$logo$3 = data.logo[0]) === null || _data$logo$3 === void 0 ? void 0 : _data$logo$3.filetype,
@@ -22467,8 +22540,10 @@ var generateReadJson$2 = {
 
 var _extraReducers$k;
 var ORGANIZATION_TREE_READ = createAsyncThunk("organizationSlice/organizationTreeList", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-  var _ref2,
+  var payload,
+      _ref2,
       rejectWithValue,
+      type,
       data,
       getJson,
       _args = arguments;
@@ -22477,11 +22552,13 @@ var ORGANIZATION_TREE_READ = createAsyncThunk("organizationSlice/organizationTre
     while (1) {
       switch (_context.prev = _context.next) {
         case 0:
+          payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
           _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
           _context.prev = 2;
+          type = payload;
           _context.next = 6;
           return fetchData({
-            body: JSON.stringify(queries$c.getTreeStuct())
+            body: JSON.stringify(queries$c.getTreeStuct(type))
           }, __readDocumentUrl__);
 
         case 6:
@@ -22530,12 +22607,13 @@ var ORGANIZATION_ENTITY_TYPE = createAsyncThunk("organizationSlice/organizationE
             var _val$coding$, _val$coding$2;
 
             if (val !== null && val !== void 0 && (_val$coding$ = val.coding[0]) !== null && _val$coding$ !== void 0 && _val$coding$.display && val !== null && val !== void 0 && (_val$coding$2 = val.coding[0]) !== null && _val$coding$2 !== void 0 && _val$coding$2._id) {
-              var _val$coding$3;
+              var _val$coding$3, _val$coding, _val$coding$4;
 
-              result.push({
+              result.push(_objectSpread2({
                 title: val === null || val === void 0 ? void 0 : (_val$coding$3 = val.coding[0]) === null || _val$coding$3 === void 0 ? void 0 : _val$coding$3.display,
-                value: val === null || val === void 0 ? void 0 : val.coding[0]._id
-              });
+                value: val === null || val === void 0 ? void 0 : val.coding[0]._id,
+                code: val === null || val === void 0 ? void 0 : (_val$coding = val.coding) === null || _val$coding === void 0 ? void 0 : (_val$coding$4 = _val$coding[0]) === null || _val$coding$4 === void 0 ? void 0 : _val$coding$4.code
+              }, val));
             }
           });
           return _context2.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -22557,8 +22635,10 @@ var ORGANIZATION_ENTITY_TYPE = createAsyncThunk("organizationSlice/organizationE
   }, _callee2, null, [[2, 12]]);
 })));
 var ORGANIZATION_GET_PARENT_ENTITY = createAsyncThunk("organizationSlice/orgParEntity", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-  var _ref6,
+  var payload,
+      _ref6,
       rejectWithValue,
+      type,
       data,
       result,
       _args3 = arguments;
@@ -22567,11 +22647,13 @@ var ORGANIZATION_GET_PARENT_ENTITY = createAsyncThunk("organizationSlice/orgParE
     while (1) {
       switch (_context3.prev = _context3.next) {
         case 0:
+          payload = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
           _ref6 = _args3.length > 1 ? _args3[1] : undefined, rejectWithValue = _ref6.rejectWithValue;
           _context3.prev = 2;
+          type = payload;
           _context3.next = 6;
           return fetchData({
-            body: JSON.stringify(queries$c.getParentEntity())
+            body: JSON.stringify(queries$c.getParentEntity(type))
           }, __readDocumentUrl__);
 
         case 6:
@@ -22672,13 +22754,13 @@ var ORGANIZATION_GET_USE_IDENTIFICATION = createAsyncThunk("organizationSlice/or
           data = _context5.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$4, _val$coding$5;
+            var _val$coding$5, _val$coding$6;
 
-            if (val !== null && val !== void 0 && (_val$coding$4 = val.coding[0]) !== null && _val$coding$4 !== void 0 && _val$coding$4.display && val !== null && val !== void 0 && (_val$coding$5 = val.coding[0]) !== null && _val$coding$5 !== void 0 && _val$coding$5._id) {
-              var _val$coding$6;
+            if (val !== null && val !== void 0 && (_val$coding$5 = val.coding[0]) !== null && _val$coding$5 !== void 0 && _val$coding$5.display && val !== null && val !== void 0 && (_val$coding$6 = val.coding[0]) !== null && _val$coding$6 !== void 0 && _val$coding$6._id) {
+              var _val$coding$7;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$6 = val.coding[0]) === null || _val$coding$6 === void 0 ? void 0 : _val$coding$6.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$7 = val.coding[0]) === null || _val$coding$7 === void 0 ? void 0 : _val$coding$7.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -22723,13 +22805,13 @@ var ORGANIZATION_GET_IDTYPE_IDENTIF = createAsyncThunk("organizationSlice/orgIdT
           data = _context6.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$7, _val$coding$8;
+            var _val$coding$8, _val$coding$9;
 
-            if (val !== null && val !== void 0 && (_val$coding$7 = val.coding[0]) !== null && _val$coding$7 !== void 0 && _val$coding$7.display && val !== null && val !== void 0 && (_val$coding$8 = val.coding[0]) !== null && _val$coding$8 !== void 0 && _val$coding$8._id) {
-              var _val$coding$9;
+            if (val !== null && val !== void 0 && (_val$coding$8 = val.coding[0]) !== null && _val$coding$8 !== void 0 && _val$coding$8.display && val !== null && val !== void 0 && (_val$coding$9 = val.coding[0]) !== null && _val$coding$9 !== void 0 && _val$coding$9._id) {
+              var _val$coding$10;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$9 = val.coding[0]) === null || _val$coding$9 === void 0 ? void 0 : _val$coding$9.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$10 = val.coding[0]) === null || _val$coding$10 === void 0 ? void 0 : _val$coding$10.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -22774,13 +22856,13 @@ var ORGANIZATION_GET_ALIAS_TYPE = createAsyncThunk("organizationSlice/aliastype"
           data = _context7.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$10, _val$coding$11;
+            var _val$coding$11, _val$coding$12;
 
-            if (val !== null && val !== void 0 && (_val$coding$10 = val.coding[0]) !== null && _val$coding$10 !== void 0 && _val$coding$10.display && val !== null && val !== void 0 && (_val$coding$11 = val.coding[0]) !== null && _val$coding$11 !== void 0 && _val$coding$11._id) {
-              var _val$coding$12;
+            if (val !== null && val !== void 0 && (_val$coding$11 = val.coding[0]) !== null && _val$coding$11 !== void 0 && _val$coding$11.display && val !== null && val !== void 0 && (_val$coding$12 = val.coding[0]) !== null && _val$coding$12 !== void 0 && _val$coding$12._id) {
+              var _val$coding$13;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$12 = val.coding[0]) === null || _val$coding$12 === void 0 ? void 0 : _val$coding$12.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$13 = val.coding[0]) === null || _val$coding$13 === void 0 ? void 0 : _val$coding$13.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -22936,13 +23018,13 @@ var ORGANIZATION_GET_ADD_TYPE = createAsyncThunk("organizationSlice/orgAddType",
           data = _context10.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$13, _val$coding$14;
+            var _val$coding$14, _val$coding$15;
 
-            if (val !== null && val !== void 0 && (_val$coding$13 = val.coding[0]) !== null && _val$coding$13 !== void 0 && _val$coding$13.display && val !== null && val !== void 0 && (_val$coding$14 = val.coding[0]) !== null && _val$coding$14 !== void 0 && _val$coding$14._id) {
-              var _val$coding$15;
+            if (val !== null && val !== void 0 && (_val$coding$14 = val.coding[0]) !== null && _val$coding$14 !== void 0 && _val$coding$14.display && val !== null && val !== void 0 && (_val$coding$15 = val.coding[0]) !== null && _val$coding$15 !== void 0 && _val$coding$15._id) {
+              var _val$coding$16;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$15 = val.coding[0]) === null || _val$coding$15 === void 0 ? void 0 : _val$coding$15.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$16 = val.coding[0]) === null || _val$coding$16 === void 0 ? void 0 : _val$coding$16.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -22987,13 +23069,13 @@ var ORGANIZATION_GET_ADD_USE = createAsyncThunk("organizationSlice/orgAddUSE", /
           data = _context11.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$16, _val$coding$17;
+            var _val$coding$17, _val$coding$18;
 
-            if (val !== null && val !== void 0 && (_val$coding$16 = val.coding[0]) !== null && _val$coding$16 !== void 0 && _val$coding$16.display && val !== null && val !== void 0 && (_val$coding$17 = val.coding[0]) !== null && _val$coding$17 !== void 0 && _val$coding$17._id) {
-              var _val$coding$18;
+            if (val !== null && val !== void 0 && (_val$coding$17 = val.coding[0]) !== null && _val$coding$17 !== void 0 && _val$coding$17.display && val !== null && val !== void 0 && (_val$coding$18 = val.coding[0]) !== null && _val$coding$18 !== void 0 && _val$coding$18._id) {
+              var _val$coding$19;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$18 = val.coding[0]) === null || _val$coding$18 === void 0 ? void 0 : _val$coding$18.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$19 = val.coding[0]) === null || _val$coding$19 === void 0 ? void 0 : _val$coding$19.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23295,13 +23377,13 @@ var ORGANIZATION_GET_CONTACTDETAILMODE = createAsyncThunk("organizationSlice/org
           data = _context17.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$19, _val$coding$20;
+            var _val$coding$20, _val$coding$21;
 
-            if (val !== null && val !== void 0 && (_val$coding$19 = val.coding[0]) !== null && _val$coding$19 !== void 0 && _val$coding$19.display && val !== null && val !== void 0 && (_val$coding$20 = val.coding[0]) !== null && _val$coding$20 !== void 0 && _val$coding$20._id) {
-              var _val$coding$21;
+            if (val !== null && val !== void 0 && (_val$coding$20 = val.coding[0]) !== null && _val$coding$20 !== void 0 && _val$coding$20.display && val !== null && val !== void 0 && (_val$coding$21 = val.coding[0]) !== null && _val$coding$21 !== void 0 && _val$coding$21._id) {
+              var _val$coding$22;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$21 = val.coding[0]) === null || _val$coding$21 === void 0 ? void 0 : _val$coding$21.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$22 = val.coding[0]) === null || _val$coding$22 === void 0 ? void 0 : _val$coding$22.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23397,13 +23479,13 @@ var ORGANIZATION_GET_CONTACTDETAILUSE = createAsyncThunk("organizationSlice/orgC
           data = _context19.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$22, _val$coding$23;
+            var _val$coding$23, _val$coding$24;
 
-            if (val !== null && val !== void 0 && (_val$coding$22 = val.coding[0]) !== null && _val$coding$22 !== void 0 && _val$coding$22.display && val !== null && val !== void 0 && (_val$coding$23 = val.coding[0]) !== null && _val$coding$23 !== void 0 && _val$coding$23._id) {
-              var _val$coding$24;
+            if (val !== null && val !== void 0 && (_val$coding$23 = val.coding[0]) !== null && _val$coding$23 !== void 0 && _val$coding$23.display && val !== null && val !== void 0 && (_val$coding$24 = val.coding[0]) !== null && _val$coding$24 !== void 0 && _val$coding$24._id) {
+              var _val$coding$25;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$24 = val.coding[0]) === null || _val$coding$24 === void 0 ? void 0 : _val$coding$24.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$25 = val.coding[0]) === null || _val$coding$25 === void 0 ? void 0 : _val$coding$25.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23448,13 +23530,13 @@ var ORGANIZATION_GET_CONTACTDETAILPRIORITY = createAsyncThunk("organizationSlice
           data = _context20.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$25, _val$coding$26;
+            var _val$coding$26, _val$coding$27;
 
-            if (val !== null && val !== void 0 && (_val$coding$25 = val.coding[0]) !== null && _val$coding$25 !== void 0 && _val$coding$25.display && val !== null && val !== void 0 && (_val$coding$26 = val.coding[0]) !== null && _val$coding$26 !== void 0 && _val$coding$26._id) {
-              var _val$coding$27;
+            if (val !== null && val !== void 0 && (_val$coding$26 = val.coding[0]) !== null && _val$coding$26 !== void 0 && _val$coding$26.display && val !== null && val !== void 0 && (_val$coding$27 = val.coding[0]) !== null && _val$coding$27 !== void 0 && _val$coding$27._id) {
+              var _val$coding$28;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$27 = val.coding[0]) === null || _val$coding$27 === void 0 ? void 0 : _val$coding$27.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$28 = val.coding[0]) === null || _val$coding$28 === void 0 ? void 0 : _val$coding$28.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23499,13 +23581,13 @@ var ORGANIZATION_GET_CONTACT_PREFIX = createAsyncThunk("organizationSlice/orgNam
           data = _context21.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$28, _val$coding$29;
+            var _val$coding$29, _val$coding$30;
 
-            if (val !== null && val !== void 0 && (_val$coding$28 = val.coding[0]) !== null && _val$coding$28 !== void 0 && _val$coding$28.display && val !== null && val !== void 0 && (_val$coding$29 = val.coding[0]) !== null && _val$coding$29 !== void 0 && _val$coding$29._id) {
-              var _val$coding$30;
+            if (val !== null && val !== void 0 && (_val$coding$29 = val.coding[0]) !== null && _val$coding$29 !== void 0 && _val$coding$29.display && val !== null && val !== void 0 && (_val$coding$30 = val.coding[0]) !== null && _val$coding$30 !== void 0 && _val$coding$30._id) {
+              var _val$coding$31;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$30 = val.coding[0]) === null || _val$coding$30 === void 0 ? void 0 : _val$coding$30.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$31 = val.coding[0]) === null || _val$coding$31 === void 0 ? void 0 : _val$coding$31.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23550,13 +23632,13 @@ var ORGANIZATION_GET_CONTACT_SUFFIX = createAsyncThunk("organizationSlice/orgNam
           data = _context22.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding$31, _val$coding$32;
+            var _val$coding$32, _val$coding$33;
 
-            if (val !== null && val !== void 0 && (_val$coding$31 = val.coding[0]) !== null && _val$coding$31 !== void 0 && _val$coding$31.display && val !== null && val !== void 0 && (_val$coding$32 = val.coding[0]) !== null && _val$coding$32 !== void 0 && _val$coding$32._id) {
-              var _val$coding$33;
+            if (val !== null && val !== void 0 && (_val$coding$32 = val.coding[0]) !== null && _val$coding$32 !== void 0 && _val$coding$32.display && val !== null && val !== void 0 && (_val$coding$33 = val.coding[0]) !== null && _val$coding$33 !== void 0 && _val$coding$33._id) {
+              var _val$coding$34;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding$33 = val.coding[0]) === null || _val$coding$33 === void 0 ? void 0 : _val$coding$33.display,
+                title: val === null || val === void 0 ? void 0 : (_val$coding$34 = val.coding[0]) === null || _val$coding$34 === void 0 ? void 0 : _val$coding$34.display,
                 value: val === null || val === void 0 ? void 0 : val.coding[0]._id
               });
             }
@@ -23601,14 +23683,14 @@ var ORGANIZATION_GET_CONTACT_DESI = createAsyncThunk("organizationSlice/position
           data = _context23.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding, _val$coding$34;
+            var _val$coding2, _val$coding2$;
 
-            if (val !== null && val !== void 0 && (_val$coding = val.coding) !== null && _val$coding !== void 0 && (_val$coding$34 = _val$coding[0]) !== null && _val$coding$34 !== void 0 && _val$coding$34.display) {
-              var _val$coding2, _val$coding2$, _val$coding3, _val$coding3$;
+            if (val !== null && val !== void 0 && (_val$coding2 = val.coding) !== null && _val$coding2 !== void 0 && (_val$coding2$ = _val$coding2[0]) !== null && _val$coding2$ !== void 0 && _val$coding2$.display) {
+              var _val$coding3, _val$coding3$, _val$coding4, _val$coding4$;
 
               result.push({
-                title: val === null || val === void 0 ? void 0 : (_val$coding2 = val.coding) === null || _val$coding2 === void 0 ? void 0 : (_val$coding2$ = _val$coding2[0]) === null || _val$coding2$ === void 0 ? void 0 : _val$coding2$.display,
-                value: val === null || val === void 0 ? void 0 : (_val$coding3 = val.coding) === null || _val$coding3 === void 0 ? void 0 : (_val$coding3$ = _val$coding3[0]) === null || _val$coding3$ === void 0 ? void 0 : _val$coding3$._id
+                title: val === null || val === void 0 ? void 0 : (_val$coding3 = val.coding) === null || _val$coding3 === void 0 ? void 0 : (_val$coding3$ = _val$coding3[0]) === null || _val$coding3$ === void 0 ? void 0 : _val$coding3$.display,
+                value: val === null || val === void 0 ? void 0 : (_val$coding4 = val.coding) === null || _val$coding4 === void 0 ? void 0 : (_val$coding4$ = _val$coding4[0]) === null || _val$coding4$ === void 0 ? void 0 : _val$coding4$._id
               });
             }
           });
@@ -23695,7 +23777,7 @@ var ORG_FROM_GET = createAsyncThunk("organizationSlice/getOrganization", /*#__PU
           key = payload.key;
           _context25.next = 6;
           return fetchData({
-            body: JSON.stringify(queries$c.getParentEntity())
+            body: JSON.stringify(queries$c.getParentEntityFull())
           }, __readDocumentUrl__);
 
         case 6:
@@ -23757,16 +23839,16 @@ var ORGANIZATION_GET_SPECIALTY_DROP = createAsyncThunk("organizationSlice/specia
           data = _context26.sent;
           result = [];
           data.result.map(function (val, i) {
-            var _val$coding4, _val$coding5, _val$coding5$;
+            var _val$coding5, _val$coding6, _val$coding6$;
 
-            if (val !== null && val !== void 0 && (_val$coding4 = val.coding) !== null && _val$coding4 !== void 0 && _val$coding4[0] && val !== null && val !== void 0 && (_val$coding5 = val.coding) !== null && _val$coding5 !== void 0 && (_val$coding5$ = _val$coding5[0]) !== null && _val$coding5$ !== void 0 && _val$coding5$._id) {
-              var _val$coding6, _val$coding6$, _val$coding7, _val$coding7$, _val$coding8, _val$coding8$, _val$coding9, _val$coding9$, _val$coding10, _val$coding10$;
+            if (val !== null && val !== void 0 && (_val$coding5 = val.coding) !== null && _val$coding5 !== void 0 && _val$coding5[0] && val !== null && val !== void 0 && (_val$coding6 = val.coding) !== null && _val$coding6 !== void 0 && (_val$coding6$ = _val$coding6[0]) !== null && _val$coding6$ !== void 0 && _val$coding6$._id) {
+              var _val$coding7, _val$coding7$, _val$coding8, _val$coding8$, _val$coding9, _val$coding9$, _val$coding10, _val$coding10$, _val$coding11, _val$coding11$;
 
               result.push({
-                label: (val === null || val === void 0 ? void 0 : (_val$coding6 = val.coding) === null || _val$coding6 === void 0 ? void 0 : (_val$coding6$ = _val$coding6[0]) === null || _val$coding6$ === void 0 ? void 0 : _val$coding6$.display) + " (" + (val === null || val === void 0 ? void 0 : (_val$coding7 = val.coding) === null || _val$coding7 === void 0 ? void 0 : (_val$coding7$ = _val$coding7[0]) === null || _val$coding7$ === void 0 ? void 0 : _val$coding7$.code) + ")",
-                value: val === null || val === void 0 ? void 0 : (_val$coding8 = val.coding) === null || _val$coding8 === void 0 ? void 0 : (_val$coding8$ = _val$coding8[0]) === null || _val$coding8$ === void 0 ? void 0 : _val$coding8$.code,
-                name: val === null || val === void 0 ? void 0 : (_val$coding9 = val.coding) === null || _val$coding9 === void 0 ? void 0 : (_val$coding9$ = _val$coding9[0]) === null || _val$coding9$ === void 0 ? void 0 : _val$coding9$.display,
-                id: val === null || val === void 0 ? void 0 : (_val$coding10 = val.coding) === null || _val$coding10 === void 0 ? void 0 : (_val$coding10$ = _val$coding10[0]) === null || _val$coding10$ === void 0 ? void 0 : _val$coding10$._id
+                label: (val === null || val === void 0 ? void 0 : (_val$coding7 = val.coding) === null || _val$coding7 === void 0 ? void 0 : (_val$coding7$ = _val$coding7[0]) === null || _val$coding7$ === void 0 ? void 0 : _val$coding7$.display) + " (" + (val === null || val === void 0 ? void 0 : (_val$coding8 = val.coding) === null || _val$coding8 === void 0 ? void 0 : (_val$coding8$ = _val$coding8[0]) === null || _val$coding8$ === void 0 ? void 0 : _val$coding8$.code) + ")",
+                value: val === null || val === void 0 ? void 0 : (_val$coding9 = val.coding) === null || _val$coding9 === void 0 ? void 0 : (_val$coding9$ = _val$coding9[0]) === null || _val$coding9$ === void 0 ? void 0 : _val$coding9$.code,
+                name: val === null || val === void 0 ? void 0 : (_val$coding10 = val.coding) === null || _val$coding10 === void 0 ? void 0 : (_val$coding10$ = _val$coding10[0]) === null || _val$coding10$ === void 0 ? void 0 : _val$coding10$.display,
+                id: val === null || val === void 0 ? void 0 : (_val$coding11 = val.coding) === null || _val$coding11 === void 0 ? void 0 : (_val$coding11$ = _val$coding11[0]) === null || _val$coding11$ === void 0 ? void 0 : _val$coding11$._id
               });
             }
           });
@@ -29478,7 +29560,7 @@ var query$3 = {
       db_name: "".concat(dbName),
       entity: "CA_OrderSet",
       filter: "CA_OrderSet._key == '".concat(_key, "' && CA_OrderSet.activestatus == true"),
-      return_fields: "merge(CA_OrderSet,{components:(for comp in CA_OrderSet_Components filter comp._id in CA_OrderSet.components return merge(comp,{orderCatalog:merge(document(comp.orderCatalog),{ordertype:document(document(comp.orderCatalog).ordertype)},{ordercategory:document(document(comp.orderCatalog).ordercategory)}),IVDosDurUOM:document(comp.IVDosDurUOM),IVInfusRateUOM:document(comp.IVInfusRateUOM),IVInfusRateVolUOM:document(comp.IVInfusRateVolUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltFreqRateUnit:document(comp.dfltFreqRateUnit),dfltFreqValUnit:document(comp.dfltFreqValUnit),dfltOrderUOM:document(comp.dfltOrderUOM),route:document(comp.route),dosageFreqCode:document(comp.dosageFreqCode)}))})"
+      return_fields: "merge(CA_OrderSet,{components:(for comp in CA_OrderSet_Components filter comp._id in CA_OrderSet.components return merge(comp,{orderCatalog:document(comp.orderCatalog),ordercategory:document(comp.ordercategory),ordertype:document(comp.ordertype),IVDosDurUOM:document(comp.IVDosDurUOM),IVInfusRateUOM:document(comp.IVInfusRateUOM),IVInfusRateVolUOM:document(comp.IVInfusRateVolUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltDurUOM:document(comp.dfltDurUOM),dfltFreqRateUnit:document(comp.dfltFreqRateUnit),dfltFreqValUnit:document(comp.dfltFreqValUnit),dfltOrderUOM:document(comp.dfltOrderUOM),route:document(comp.route),dosageFreqCode:document(comp.dosageFreqCode)}))})"
     };
   },
   status_update_order_set_master: function status_update_order_set_master(data) {
@@ -29531,7 +29613,16 @@ var dynamicMaster$1 = {
       sort: "OrderType.shortdesc"
     };
   },
-  orderDrugCatalog: function orderDrugCatalog(order_category, order_drug_type) {
+  drugType: function drugType() {
+    return {
+      db_name: "".concat(dbName),
+      entity: "DrugType",
+      filter: "DrugType.activestatus == true && DrugType.status == true",
+      return_fields: "KEEP(DrugType,'_id','_key','drugtype','longdesc','shortdesc')",
+      sort: "DrugType.shortdesc"
+    };
+  },
+  orderCatalog: function orderCatalog(order_category, order_drug_type) {
     return {
       db_name: "".concat(dbName),
       entity: "OrderCatalog",
@@ -29539,6 +29630,15 @@ var dynamicMaster$1 = {
       return_fields: "merge(keep(OrderCatalog,'id','_key','_id','shortdesc','ordertype','ordercategory','ordercatalog','longdesc'),{ordertype:document(OrderCatalog.ordertype)},{ordercategory:document(OrderCatalog.ordercategory)},{OrderCatalogByEncounterTypeAge:document(OrderCatalog.OrderCatalogByEncounterTypeAge)[*].freqappl})",
       sort: "OrderCatalog.shortdesc"
     };
+  },
+  drugCatalog: function drugCatalog(drug_type) {
+    return {
+      db_name: "".concat(dbName),
+      entity: "DrugMaster",
+      filter: "DrugMaster.DrugType=='".concat(drug_type, "' && DrugMaster.activestatus == true && DrugMaster.statusactive==true"),
+      return_fields: "merge(keep(DrugMaster,'id','_id','_key','ShortDesc','LongDesc','DrugType'),{DrugType:document(DrugMaster.DrugType)})",
+      sort: "DrugMaster.ShortDesc"
+    };
   }
 };
 
@@ -29575,7 +29675,7 @@ var generateJson$2 = function generateJson(data) {
 var constructComponents = function constructComponents(data) {
   var arr = [];
   data.map(function (val) {
-    var _val$id, _val$seqNo, _val$orderCatalog$val, _val$orderCatalog, _val$explanatoryNote, _val$practitionerInst, _parseInt, _val$quantity_type$va, _val$quantity_type, _parseInt2, _val$route$value, _val$route, _parseInt3, _val$frequency_type$v, _val$frequency_type, _parseInt4, _val$rate_type$value, _val$rate_type, _parseInt5, _val$duration_type$va, _val$duration_type, _parseInt6, _val$dosage_freq_code, _val$dosage_freq_code2, _parseInt7, _val$in_infusion_rate, _val$in_infusion_rate2, _parseInt8, _val$in_infusion_rate3, _val$in_infusion_rate4, _parseInt9, _val$iv_dosage_durati, _val$iv_dosage_durati2, _val$parentordercatal, _val$parentordercatal2;
+    var _val$id, _val$seqNo, _val$orderCatalog$val, _val$orderCatalog, _val$orderCategory$va, _val$orderCategory, _val$orderTypeDrugTyp, _val$orderTypeDrugTyp2, _val$explanatoryNote, _val$practitionerInst, _parseInt, _val$quantity_type$va, _val$quantity_type, _parseInt2, _val$route$value, _val$route, _parseInt3, _val$frequency_type$v, _val$frequency_type, _parseInt4, _val$rate_type$value, _val$rate_type, _parseInt5, _val$duration_type$va, _val$duration_type, _parseInt6, _val$dosage_freq_code, _val$dosage_freq_code2, _parseInt7, _val$in_infusion_rate, _val$in_infusion_rate2, _parseInt8, _val$in_infusion_rate3, _val$in_infusion_rate4, _parseInt9, _val$iv_dosage_durati, _val$iv_dosage_durati2, _val$parentordercatal, _val$parentordercatal2;
 
     var _key = {};
 
@@ -29590,6 +29690,8 @@ var constructComponents = function constructComponents(data) {
     }, _key), {}, {
       seqNo: (_val$seqNo = val === null || val === void 0 ? void 0 : val.seqNo) !== null && _val$seqNo !== void 0 ? _val$seqNo : 0,
       orderCatalog: (_val$orderCatalog$val = val === null || val === void 0 ? void 0 : (_val$orderCatalog = val.orderCatalog) === null || _val$orderCatalog === void 0 ? void 0 : _val$orderCatalog.value) !== null && _val$orderCatalog$val !== void 0 ? _val$orderCatalog$val : "",
+      ordercategory: (_val$orderCategory$va = val === null || val === void 0 ? void 0 : (_val$orderCategory = val.orderCategory) === null || _val$orderCategory === void 0 ? void 0 : _val$orderCategory.value) !== null && _val$orderCategory$va !== void 0 ? _val$orderCategory$va : "",
+      ordertype: (_val$orderTypeDrugTyp = val === null || val === void 0 ? void 0 : (_val$orderTypeDrugTyp2 = val.orderTypeDrugType) === null || _val$orderTypeDrugTyp2 === void 0 ? void 0 : _val$orderTypeDrugTyp2.value) !== null && _val$orderTypeDrugTyp !== void 0 ? _val$orderTypeDrugTyp : "",
       explNote: (_val$explanatoryNote = val === null || val === void 0 ? void 0 : val.explanatoryNote) !== null && _val$explanatoryNote !== void 0 ? _val$explanatoryNote : "",
       practInstr: (_val$practitionerInst = val === null || val === void 0 ? void 0 : val.practitionerInstructions) !== null && _val$practitionerInst !== void 0 ? _val$practitionerInst : "",
       required: val === null || val === void 0 ? void 0 : val.required,
@@ -29621,7 +29723,7 @@ var constructComponents = function constructComponents(data) {
       var _val$children;
 
       val === null || val === void 0 ? void 0 : (_val$children = val.children) === null || _val$children === void 0 ? void 0 : _val$children.map(function (val_) {
-        var _val_$id, _val_$seqNo, _val_$orderCatalog$va, _val_$orderCatalog, _val_$explanatoryNote, _val_$practitionerIns, _parseInt10, _val_$quantity_type$v, _val_$quantity_type, _parseInt11, _val_$route$value, _val_$route, _parseInt12, _val_$frequency_type$, _val_$frequency_type, _parseInt13, _val_$rate_type$value, _val_$rate_type, _parseInt14, _val_$duration_type$v, _val_$duration_type, _parseInt15, _val_$dosage_freq_cod, _val_$dosage_freq_cod2, _parseInt16, _val_$in_infusion_rat, _val_$in_infusion_rat2, _parseInt17, _val_$in_infusion_rat3, _val_$in_infusion_rat4, _parseInt18, _val_$iv_dosage_durat, _val_$iv_dosage_durat2, _val_$parentordercata, _val_$parentordercata2;
+        var _val_$id, _val_$seqNo, _val_$orderCatalog$va, _val_$orderCatalog, _val$orderCategory$va2, _val$orderCategory2, _val$orderTypeDrugTyp3, _val$orderTypeDrugTyp4, _val_$explanatoryNote, _val_$practitionerIns, _parseInt10, _val_$quantity_type$v, _val_$quantity_type, _parseInt11, _val_$route$value, _val_$route, _parseInt12, _val_$frequency_type$, _val_$frequency_type, _parseInt13, _val_$rate_type$value, _val_$rate_type, _parseInt14, _val_$duration_type$v, _val_$duration_type, _parseInt15, _val_$dosage_freq_cod, _val_$dosage_freq_cod2, _parseInt16, _val_$in_infusion_rat, _val_$in_infusion_rat2, _parseInt17, _val_$in_infusion_rat3, _val_$in_infusion_rat4, _parseInt18, _val_$iv_dosage_durat, _val_$iv_dosage_durat2, _val_$parentordercata, _val_$parentordercata2;
 
         if (val_ !== null && val_ !== void 0 && val_._key) {
           ({
@@ -29633,6 +29735,8 @@ var constructComponents = function constructComponents(data) {
           id: (_val_$id = val_ === null || val_ === void 0 ? void 0 : val_.id) !== null && _val_$id !== void 0 ? _val_$id : 0,
           seqNo: (_val_$seqNo = val_ === null || val_ === void 0 ? void 0 : val_.seqNo) !== null && _val_$seqNo !== void 0 ? _val_$seqNo : 0,
           orderCatalog: (_val_$orderCatalog$va = val_ === null || val_ === void 0 ? void 0 : (_val_$orderCatalog = val_.orderCatalog) === null || _val_$orderCatalog === void 0 ? void 0 : _val_$orderCatalog.value) !== null && _val_$orderCatalog$va !== void 0 ? _val_$orderCatalog$va : "",
+          ordercategory: (_val$orderCategory$va2 = val === null || val === void 0 ? void 0 : (_val$orderCategory2 = val.orderCategory) === null || _val$orderCategory2 === void 0 ? void 0 : _val$orderCategory2.value) !== null && _val$orderCategory$va2 !== void 0 ? _val$orderCategory$va2 : "",
+          ordertype: (_val$orderTypeDrugTyp3 = val === null || val === void 0 ? void 0 : (_val$orderTypeDrugTyp4 = val.orderTypeDrugType) === null || _val$orderTypeDrugTyp4 === void 0 ? void 0 : _val$orderTypeDrugTyp4.value) !== null && _val$orderTypeDrugTyp3 !== void 0 ? _val$orderTypeDrugTyp3 : "",
           explNote: (_val_$explanatoryNote = val_ === null || val_ === void 0 ? void 0 : val_.explanatoryNote) !== null && _val_$explanatoryNote !== void 0 ? _val_$explanatoryNote : "",
           practInstr: (_val_$practitionerIns = val_ === null || val_ === void 0 ? void 0 : val_.practitionerInstructions) !== null && _val_$practitionerIns !== void 0 ? _val_$practitionerIns : "",
           required: val_ === null || val_ === void 0 ? void 0 : val_.required,
@@ -29664,7 +29768,7 @@ var constructComponents = function constructComponents(data) {
   return arr;
 };
 
-var generateReadJSON$2 = function generateReadJSON(data, state) {
+var generateReadJSON$2 = function generateReadJSON(data) {
   var json = {
     //INITAIL STATE
     parentSeqNumber: null,
@@ -29752,121 +29856,130 @@ var getSeqNumber = function getSeqNumber(components) {
       maxNum = c.seqNo;
     }
   });
-  debugger;
   return maxNum + 1;
 };
 
-var constructTabelData = function constructTabelData(data, state) {
+var constructTabelData = function constructTabelData(data) {
   var arr = [];
-  data === null || data === void 0 ? void 0 : data.map(function (val) {
-    if (!(val !== null && val !== void 0 && val.parentCatSeqNo)) {
-      var _val$id, _val$_key, _val$orderCatalog$ord, _val$orderCatalog, _val$seqNo, _val$orderCatalog$ord2, _val$orderCatalog2, _val$orderCatalog3, _val$orderCatalog4, _val$orderCatalog5, _val$orderCatalog6, _val$orderCatalog7, _val$orderCatalog7$or, _val$orderCatalog8, _val$orderCatalog8$or, _val$orderCatalog9, _val$orderCatalog9$or, _val$orderCatalog10, _val$orderCatalog10$o, _val$orderCatalog11, _val$orderCatalog11$o, _val$orderCatalog12, _val$orderCatalog12$o, _val$orderCatalog13, _val$orderCatalog13$o, _val$orderCatalog14, _val$orderCatalog14$o, _val$dfltOrderUOM, _val$dfltOrderUOM2, _val$dfltOrderUOM3, _val$dfltOrderUOM4, _val$dfltOrderUOM5, _val$dfltOrderUOM6, _val$IVInfusRateVol, _val$IVInfusRateVolUO, _val$IVInfusRateVolUO2, _val$IVInfusRateVolUO3, _val$IVInfusRateVolUO4, _val$IVDosDurValue, _val$IVDosDurUOM, _val$IVDosDurUOM2, _val$IVDosDurUOM3, _val$IVDosDurUOM4, _val$IVDosDurValue2, _val$IVDosDurUOM5, _val$IVDosDurUOM6, _val$IVDosDurUOM7, _val$IVDosDurUOM8, _val$dosageFreqCode, _val$dosageFreqCode2, _val$dosageFreqCode3, _val$dosageFreqCode4, _val$startDay, _val$dfltDuration, _val$dfltDurUOM, _val$dfltDurUOM2, _val$dfltDurUOM3, _val$dfltDurUOM4, _val$dfltDurUOM5, _val$dfltDurUOM6, _val$route, _val$route2, _val$route3, _val$route4, _val$route$shortdesc, _val$route5, _val$dfltFreqVal, _val$dfltFreqValUnit, _val$dfltFreqValUnit2, _val$dfltFreqValUnit3, _val$dfltFreqValUnit4, _val$dfltFreqValUnit5, _val$dfltFreqValUnit6, _val$dfltFreqRate, _val$dfltFreqRateUnit, _val$dfltFreqRateUnit2, _val$dfltFreqRateUnit3, _val$dfltFreqRateUnit4, _val$dfltFreqRateUnit5, _val$dfltFreqRateUnit6, _val$additive, _val$parentSequence, _val$parentSequence2, _val$explNote, _val$practInstr, _constructChildrenTab, _obj;
-
-      var obj = (_obj = {
-        id: (_val$id = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id !== void 0 ? _val$id : 0,
-        _key: (_val$_key = val === null || val === void 0 ? void 0 : val._key) !== null && _val$_key !== void 0 ? _val$_key : 0,
-        typeId: (_val$orderCatalog$ord = val === null || val === void 0 ? void 0 : (_val$orderCatalog = val.orderCatalog) === null || _val$orderCatalog === void 0 ? void 0 : _val$orderCatalog.ordercategory._id) !== null && _val$orderCatalog$ord !== void 0 ? _val$orderCatalog$ord : "",
-        seqNo: (_val$seqNo = val === null || val === void 0 ? void 0 : val.seqNo) !== null && _val$seqNo !== void 0 ? _val$seqNo : "",
-        orderCategory: (_val$orderCatalog$ord2 = val === null || val === void 0 ? void 0 : (_val$orderCatalog2 = val.orderCatalog) === null || _val$orderCatalog2 === void 0 ? void 0 : _val$orderCatalog2.ordercategory) !== null && _val$orderCatalog$ord2 !== void 0 ? _val$orderCatalog$ord2 : {},
-        orderCatalog: val !== null && val !== void 0 && (_val$orderCatalog3 = val.orderCatalog) !== null && _val$orderCatalog3 !== void 0 && _val$orderCatalog3._id && val !== null && val !== void 0 && (_val$orderCatalog4 = val.orderCatalog) !== null && _val$orderCatalog4 !== void 0 && _val$orderCatalog4.shortdesc ? {
-          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog5 = val.orderCatalog) === null || _val$orderCatalog5 === void 0 ? void 0 : _val$orderCatalog5._id,
-          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog6 = val.orderCatalog) === null || _val$orderCatalog6 === void 0 ? void 0 : _val$orderCatalog6.shortdesc
-        } : {},
-        orderTypeDrugType: val !== null && val !== void 0 && (_val$orderCatalog7 = val.orderCatalog) !== null && _val$orderCatalog7 !== void 0 && (_val$orderCatalog7$or = _val$orderCatalog7.ordertype) !== null && _val$orderCatalog7$or !== void 0 && _val$orderCatalog7$or._id && val !== null && val !== void 0 && (_val$orderCatalog8 = val.orderCatalog) !== null && _val$orderCatalog8 !== void 0 && (_val$orderCatalog8$or = _val$orderCatalog8.ordertype) !== null && _val$orderCatalog8$or !== void 0 && _val$orderCatalog8$or.shortdesc ? {
-          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog9 = val.orderCatalog) === null || _val$orderCatalog9 === void 0 ? void 0 : (_val$orderCatalog9$or = _val$orderCatalog9.ordertype) === null || _val$orderCatalog9$or === void 0 ? void 0 : _val$orderCatalog9$or._id,
-          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog10 = val.orderCatalog) === null || _val$orderCatalog10 === void 0 ? void 0 : (_val$orderCatalog10$o = _val$orderCatalog10.ordertype) === null || _val$orderCatalog10$o === void 0 ? void 0 : _val$orderCatalog10$o.shortdesc
-        } : {}
-      }, _defineProperty(_obj, "orderCategory", val !== null && val !== void 0 && (_val$orderCatalog11 = val.orderCatalog) !== null && _val$orderCatalog11 !== void 0 && (_val$orderCatalog11$o = _val$orderCatalog11.ordercategory) !== null && _val$orderCatalog11$o !== void 0 && _val$orderCatalog11$o._id && val !== null && val !== void 0 && (_val$orderCatalog12 = val.orderCatalog) !== null && _val$orderCatalog12 !== void 0 && (_val$orderCatalog12$o = _val$orderCatalog12.ordercategory) !== null && _val$orderCatalog12$o !== void 0 && _val$orderCatalog12$o.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$orderCatalog13 = val.orderCatalog) === null || _val$orderCatalog13 === void 0 ? void 0 : (_val$orderCatalog13$o = _val$orderCatalog13.ordercategory) === null || _val$orderCatalog13$o === void 0 ? void 0 : _val$orderCatalog13$o._id,
-        label: val === null || val === void 0 ? void 0 : (_val$orderCatalog14 = val.orderCatalog) === null || _val$orderCatalog14 === void 0 ? void 0 : (_val$orderCatalog14$o = _val$orderCatalog14.ordercategory) === null || _val$orderCatalog14$o === void 0 ? void 0 : _val$orderCatalog14$o.shortdesc
-      } : {}), _defineProperty(_obj, "required", val !== null && val !== void 0 && val.required ? val === null || val === void 0 ? void 0 : val.required : false), _defineProperty(_obj, "requiredT", val !== null && val !== void 0 && val.required ? (val === null || val === void 0 ? void 0 : val.required) === true ? "Yes" : "No" : "No"), _defineProperty(_obj, "quantity_number", val !== null && val !== void 0 && val.dfltOrderQty ? val === null || val === void 0 ? void 0 : val.dfltOrderQty : ""), _defineProperty(_obj, "quantity_type", val !== null && val !== void 0 && (_val$dfltOrderUOM = val.dfltOrderUOM) !== null && _val$dfltOrderUOM !== void 0 && _val$dfltOrderUOM._id && val !== null && val !== void 0 && (_val$dfltOrderUOM2 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM2 !== void 0 && _val$dfltOrderUOM2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM3 = val.dfltOrderUOM) === null || _val$dfltOrderUOM3 === void 0 ? void 0 : _val$dfltOrderUOM3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM4 = val.dfltOrderUOM) === null || _val$dfltOrderUOM4 === void 0 ? void 0 : _val$dfltOrderUOM4.display
-      } : {}), _defineProperty(_obj, "quantityT", val !== null && val !== void 0 && (_val$dfltOrderUOM5 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM5 !== void 0 && _val$dfltOrderUOM5.display && val !== null && val !== void 0 && val.dfltOrderQty ? (val === null || val === void 0 ? void 0 : val.dfltOrderQty) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM6 = val.dfltOrderUOM) === null || _val$dfltOrderUOM6 === void 0 ? void 0 : _val$dfltOrderUOM6.display) : "-"), _defineProperty(_obj, "in_infusion_rate_volume_number", (_val$IVInfusRateVol = val === null || val === void 0 ? void 0 : val.IVInfusRateVol) !== null && _val$IVInfusRateVol !== void 0 ? _val$IVInfusRateVol : ""), _defineProperty(_obj, "in_infusion_rate_volume_type", val !== null && val !== void 0 && (_val$IVInfusRateVolUO = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO !== void 0 && _val$IVInfusRateVolUO._id && val !== null && val !== void 0 && (_val$IVInfusRateVolUO2 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO2 !== void 0 && _val$IVInfusRateVolUO2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO3 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO3 === void 0 ? void 0 : _val$IVInfusRateVolUO3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO4 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO4 === void 0 ? void 0 : _val$IVInfusRateVolUO4.display
-      } : {}), _defineProperty(_obj, "in_infusion_rate_duration_number", (_val$IVDosDurValue = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue !== void 0 ? _val$IVDosDurValue : ""), _defineProperty(_obj, "in_infusion_rate_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM = val.IVDosDurUOM) !== null && _val$IVDosDurUOM !== void 0 && _val$IVDosDurUOM._id && val !== null && val !== void 0 && (_val$IVDosDurUOM2 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM2 !== void 0 && _val$IVDosDurUOM2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM3 = val.IVDosDurUOM) === null || _val$IVDosDurUOM3 === void 0 ? void 0 : _val$IVDosDurUOM3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM4 = val.IVDosDurUOM) === null || _val$IVDosDurUOM4 === void 0 ? void 0 : _val$IVDosDurUOM4.display
-      } : {}), _defineProperty(_obj, "iv_dosage_duration_number", (_val$IVDosDurValue2 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue2 !== void 0 ? _val$IVDosDurValue2 : ""), _defineProperty(_obj, "iv_dosage_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM5 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM5 !== void 0 && _val$IVDosDurUOM5._id && val !== null && val !== void 0 && (_val$IVDosDurUOM6 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM6 !== void 0 && _val$IVDosDurUOM6.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM7 = val.IVDosDurUOM) === null || _val$IVDosDurUOM7 === void 0 ? void 0 : _val$IVDosDurUOM7._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM8 = val.IVDosDurUOM) === null || _val$IVDosDurUOM8 === void 0 ? void 0 : _val$IVDosDurUOM8.display
-      } : {}), _defineProperty(_obj, "dosage_freq_code", val !== null && val !== void 0 && (_val$dosageFreqCode = val.dosageFreqCode) !== null && _val$dosageFreqCode !== void 0 && _val$dosageFreqCode._id && val !== null && val !== void 0 && (_val$dosageFreqCode2 = val.dosageFreqCode) !== null && _val$dosageFreqCode2 !== void 0 && _val$dosageFreqCode2.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode3 = val.dosageFreqCode) === null || _val$dosageFreqCode3 === void 0 ? void 0 : _val$dosageFreqCode3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode4 = val.dosageFreqCode) === null || _val$dosageFreqCode4 === void 0 ? void 0 : _val$dosageFreqCode4.shortdesc
-      } : {}), _defineProperty(_obj, "startDay", (_val$startDay = val === null || val === void 0 ? void 0 : val.startDay) !== null && _val$startDay !== void 0 ? _val$startDay : ""), _defineProperty(_obj, "duration_number", (_val$dfltDuration = val === null || val === void 0 ? void 0 : val.dfltDuration) !== null && _val$dfltDuration !== void 0 ? _val$dfltDuration : ""), _defineProperty(_obj, "duration_type", val !== null && val !== void 0 && (_val$dfltDurUOM = val.dfltDurUOM) !== null && _val$dfltDurUOM !== void 0 && _val$dfltDurUOM._id && val !== null && val !== void 0 && (_val$dfltDurUOM2 = val.dfltDurUOM) !== null && _val$dfltDurUOM2 !== void 0 && _val$dfltDurUOM2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM3 = val.dfltDurUOM) === null || _val$dfltDurUOM3 === void 0 ? void 0 : _val$dfltDurUOM3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM4 = val.dfltDurUOM) === null || _val$dfltDurUOM4 === void 0 ? void 0 : _val$dfltDurUOM4.display
-      } : {}), _defineProperty(_obj, "durationT", val !== null && val !== void 0 && val.dfltDuration && val !== null && val !== void 0 && (_val$dfltDurUOM5 = val.dfltDurUOM) !== null && _val$dfltDurUOM5 !== void 0 && _val$dfltDurUOM5.display ? (val === null || val === void 0 ? void 0 : val.dfltDuration) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltDurUOM6 = val.dfltDurUOM) === null || _val$dfltDurUOM6 === void 0 ? void 0 : _val$dfltDurUOM6.display) : "-"), _defineProperty(_obj, "route", val !== null && val !== void 0 && (_val$route = val.route) !== null && _val$route !== void 0 && _val$route._id && val !== null && val !== void 0 && (_val$route2 = val.route) !== null && _val$route2 !== void 0 && _val$route2.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$route3 = val.route) === null || _val$route3 === void 0 ? void 0 : _val$route3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$route4 = val.route) === null || _val$route4 === void 0 ? void 0 : _val$route4.shortdesc
-      } : {}), _defineProperty(_obj, "routeT", (_val$route$shortdesc = val === null || val === void 0 ? void 0 : (_val$route5 = val.route) === null || _val$route5 === void 0 ? void 0 : _val$route5.shortdesc) !== null && _val$route$shortdesc !== void 0 ? _val$route$shortdesc : "-"), _defineProperty(_obj, "frequency_number", (_val$dfltFreqVal = val === null || val === void 0 ? void 0 : val.dfltFreqVal) !== null && _val$dfltFreqVal !== void 0 ? _val$dfltFreqVal : 0), _defineProperty(_obj, "frequency_type", val !== null && val !== void 0 && (_val$dfltFreqValUnit = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit !== void 0 && _val$dfltFreqValUnit._id && val !== null && val !== void 0 && (_val$dfltFreqValUnit2 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit2 !== void 0 && _val$dfltFreqValUnit2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit3 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit3 === void 0 ? void 0 : _val$dfltFreqValUnit3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit4 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit4 === void 0 ? void 0 : _val$dfltFreqValUnit4.display
-      } : {}), _defineProperty(_obj, "frequencyT", val !== null && val !== void 0 && val.dfltFreqVal && val !== null && val !== void 0 && (_val$dfltFreqValUnit5 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit5 !== void 0 && _val$dfltFreqValUnit5.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqVal) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit6 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit6 === void 0 ? void 0 : _val$dfltFreqValUnit6.display) : "-"), _defineProperty(_obj, "rate_number", (_val$dfltFreqRate = val === null || val === void 0 ? void 0 : val.dfltFreqRate) !== null && _val$dfltFreqRate !== void 0 ? _val$dfltFreqRate : ""), _defineProperty(_obj, "rate_type", val !== null && val !== void 0 && (_val$dfltFreqRateUnit = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit !== void 0 && _val$dfltFreqRateUnit._id && val !== null && val !== void 0 && (_val$dfltFreqRateUnit2 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit2 !== void 0 && _val$dfltFreqRateUnit2.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit3 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit3 === void 0 ? void 0 : _val$dfltFreqRateUnit3._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit4 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit4 === void 0 ? void 0 : _val$dfltFreqRateUnit4.display
-      } : {}), _defineProperty(_obj, "rateT", val !== null && val !== void 0 && val.dfltFreqRate && val !== null && val !== void 0 && (_val$dfltFreqRateUnit5 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit5 !== void 0 && _val$dfltFreqRateUnit5.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqRate) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit6 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit6 === void 0 ? void 0 : _val$dfltFreqRateUnit6.display) : "-"), _defineProperty(_obj, "additive", (_val$additive = val === null || val === void 0 ? void 0 : val.additive) !== null && _val$additive !== void 0 ? _val$additive : false), _defineProperty(_obj, "additivT", val !== null && val !== void 0 && val.additive ? (val === null || val === void 0 ? void 0 : val.additive) === true ? "Yes" : "No" : "No"), _defineProperty(_obj, "parentSequence", (_val$parentSequence = val === null || val === void 0 ? void 0 : val.parentSequence) !== null && _val$parentSequence !== void 0 ? _val$parentSequence : ""), _defineProperty(_obj, "parentSequenceT", (_val$parentSequence2 = val === null || val === void 0 ? void 0 : val.parentSequence) !== null && _val$parentSequence2 !== void 0 ? _val$parentSequence2 : "-"), _defineProperty(_obj, "explanatoryNote", (_val$explNote = val === null || val === void 0 ? void 0 : val.explNote) !== null && _val$explNote !== void 0 ? _val$explNote : ""), _defineProperty(_obj, "practitionerInstructions", (_val$practInstr = val === null || val === void 0 ? void 0 : val.practInstr) !== null && _val$practInstr !== void 0 ? _val$practInstr : ""), _defineProperty(_obj, "children", (_constructChildrenTab = constructChildrenTabelData(data, val === null || val === void 0 ? void 0 : val.seqNo)) !== null && _constructChildrenTab !== void 0 ? _constructChildrenTab : []), _obj);
-      arr.push(obj);
-    }
-  });
+
+  if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
+    data === null || data === void 0 ? void 0 : data.map(function (val) {
+      if (!(val !== null && val !== void 0 && val.parentCatSeqNo)) {
+        var _val$id, _val$_key, _val$ordercategory$_i, _val$seqNo, _val$ordercategory, _val$ordercategory2, _val$ordercategory3, _val$ordercategory4, _val$ordercategory5, _val$ordertype, _val$ordertype2, _val$ordertype3, _val$ordertype4, _val$orderCatalog, _val$orderCatalog2, _val$orderCatalog3, _val$orderCatalog4, _val$orderCatalog5, _val$orderCatalog6, _val$orderCatalog7, _val$orderCatalog8, _val$dfltOrderUOM, _val$dfltOrderUOM2, _val$dfltOrderUOM3, _val$dfltOrderUOM4, _val$dfltOrderUOM5, _val$dfltOrderUOM6, _val$IVInfusRateVol, _val$IVInfusRateVolUO, _val$IVInfusRateVolUO2, _val$IVInfusRateVolUO3, _val$IVInfusRateVolUO4, _val$IVDosDurValue, _val$IVDosDurUOM, _val$IVDosDurUOM2, _val$IVDosDurUOM3, _val$IVDosDurUOM4, _val$IVDosDurValue2, _val$IVDosDurUOM5, _val$IVDosDurUOM6, _val$IVDosDurUOM7, _val$IVDosDurUOM8, _val$dosageFreqCode, _val$dosageFreqCode2, _val$dosageFreqCode3, _val$dosageFreqCode4, _val$startDay, _val$dfltDuration, _val$dfltDurUOM, _val$dfltDurUOM2, _val$dfltDurUOM3, _val$dfltDurUOM4, _val$dfltDurUOM5, _val$dfltDurUOM6, _val$route, _val$route2, _val$route3, _val$route4, _val$route$shortdesc, _val$route5, _val$dfltFreqVal, _val$dfltFreqValUnit, _val$dfltFreqValUnit2, _val$dfltFreqValUnit3, _val$dfltFreqValUnit4, _val$dfltFreqValUnit5, _val$dfltFreqValUnit6, _val$dfltFreqRate, _val$dfltFreqRateUnit, _val$dfltFreqRateUnit2, _val$dfltFreqRateUnit3, _val$dfltFreqRateUnit4, _val$dfltFreqRateUnit5, _val$dfltFreqRateUnit6, _val$additive, _val$parentSequence, _val$parentSequence2, _val$explNote, _val$practInstr, _constructChildrenTab, _obj;
+
+        var obj = (_obj = {
+          id: (_val$id = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id !== void 0 ? _val$id : 0,
+          _key: (_val$_key = val === null || val === void 0 ? void 0 : val._key) !== null && _val$_key !== void 0 ? _val$_key : 0,
+          typeId: (_val$ordercategory$_i = val === null || val === void 0 ? void 0 : val.ordercategory._id) !== null && _val$ordercategory$_i !== void 0 ? _val$ordercategory$_i : "",
+          seqNo: (_val$seqNo = val === null || val === void 0 ? void 0 : val.seqNo) !== null && _val$seqNo !== void 0 ? _val$seqNo : "",
+          orderCategory: (_val$ordercategory = val === null || val === void 0 ? void 0 : val.ordercategory) !== null && _val$ordercategory !== void 0 ? _val$ordercategory : {}
+        }, _defineProperty(_obj, "orderCategory", val !== null && val !== void 0 && (_val$ordercategory2 = val.ordercategory) !== null && _val$ordercategory2 !== void 0 && _val$ordercategory2._id && val !== null && val !== void 0 && (_val$ordercategory3 = val.ordercategory) !== null && _val$ordercategory3 !== void 0 && _val$ordercategory3.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$ordercategory4 = val.ordercategory) === null || _val$ordercategory4 === void 0 ? void 0 : _val$ordercategory4._id,
+          label: val === null || val === void 0 ? void 0 : (_val$ordercategory5 = val.ordercategory) === null || _val$ordercategory5 === void 0 ? void 0 : _val$ordercategory5.shortdesc
+        } : {}), _defineProperty(_obj, "orderTypeDrugType", val !== null && val !== void 0 && (_val$ordertype = val.ordertype) !== null && _val$ordertype !== void 0 && _val$ordertype._id && val !== null && val !== void 0 && (_val$ordertype2 = val.ordertype) !== null && _val$ordertype2 !== void 0 && _val$ordertype2.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$ordertype3 = val.ordertype) === null || _val$ordertype3 === void 0 ? void 0 : _val$ordertype3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$ordertype4 = val.ordertype) === null || _val$ordertype4 === void 0 ? void 0 : _val$ordertype4.shortdesc
+        } : {}), _defineProperty(_obj, "orderCatalog", val !== null && val !== void 0 && (_val$orderCatalog = val.orderCatalog) !== null && _val$orderCatalog !== void 0 && _val$orderCatalog._id && val !== null && val !== void 0 && (_val$orderCatalog2 = val.orderCatalog) !== null && _val$orderCatalog2 !== void 0 && _val$orderCatalog2.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog3 = val.orderCatalog) === null || _val$orderCatalog3 === void 0 ? void 0 : _val$orderCatalog3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog4 = val.orderCatalog) === null || _val$orderCatalog4 === void 0 ? void 0 : _val$orderCatalog4.shortdesc
+        } : val !== null && val !== void 0 && (_val$orderCatalog5 = val.orderCatalog) !== null && _val$orderCatalog5 !== void 0 && _val$orderCatalog5._id && val !== null && val !== void 0 && (_val$orderCatalog6 = val.orderCatalog) !== null && _val$orderCatalog6 !== void 0 && _val$orderCatalog6.ShortDesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog7 = val.orderCatalog) === null || _val$orderCatalog7 === void 0 ? void 0 : _val$orderCatalog7._id,
+          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog8 = val.orderCatalog) === null || _val$orderCatalog8 === void 0 ? void 0 : _val$orderCatalog8.ShortDesc
+        } : {}), _defineProperty(_obj, "required", val !== null && val !== void 0 && val.required ? val === null || val === void 0 ? void 0 : val.required : false), _defineProperty(_obj, "requiredT", val !== null && val !== void 0 && val.required ? (val === null || val === void 0 ? void 0 : val.required) === true ? "Yes" : "No" : "No"), _defineProperty(_obj, "quantity_number", val !== null && val !== void 0 && val.dfltOrderQty ? val === null || val === void 0 ? void 0 : val.dfltOrderQty : ""), _defineProperty(_obj, "quantity_type", val !== null && val !== void 0 && (_val$dfltOrderUOM = val.dfltOrderUOM) !== null && _val$dfltOrderUOM !== void 0 && _val$dfltOrderUOM._id && val !== null && val !== void 0 && (_val$dfltOrderUOM2 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM2 !== void 0 && _val$dfltOrderUOM2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM3 = val.dfltOrderUOM) === null || _val$dfltOrderUOM3 === void 0 ? void 0 : _val$dfltOrderUOM3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM4 = val.dfltOrderUOM) === null || _val$dfltOrderUOM4 === void 0 ? void 0 : _val$dfltOrderUOM4.display
+        } : {}), _defineProperty(_obj, "quantityT", val !== null && val !== void 0 && (_val$dfltOrderUOM5 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM5 !== void 0 && _val$dfltOrderUOM5.display && val !== null && val !== void 0 && val.dfltOrderQty ? (val === null || val === void 0 ? void 0 : val.dfltOrderQty) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM6 = val.dfltOrderUOM) === null || _val$dfltOrderUOM6 === void 0 ? void 0 : _val$dfltOrderUOM6.display) : "-"), _defineProperty(_obj, "in_infusion_rate_volume_number", (_val$IVInfusRateVol = val === null || val === void 0 ? void 0 : val.IVInfusRateVol) !== null && _val$IVInfusRateVol !== void 0 ? _val$IVInfusRateVol : ""), _defineProperty(_obj, "in_infusion_rate_volume_type", val !== null && val !== void 0 && (_val$IVInfusRateVolUO = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO !== void 0 && _val$IVInfusRateVolUO._id && val !== null && val !== void 0 && (_val$IVInfusRateVolUO2 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO2 !== void 0 && _val$IVInfusRateVolUO2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO3 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO3 === void 0 ? void 0 : _val$IVInfusRateVolUO3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO4 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO4 === void 0 ? void 0 : _val$IVInfusRateVolUO4.display
+        } : {}), _defineProperty(_obj, "in_infusion_rate_duration_number", (_val$IVDosDurValue = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue !== void 0 ? _val$IVDosDurValue : ""), _defineProperty(_obj, "in_infusion_rate_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM = val.IVDosDurUOM) !== null && _val$IVDosDurUOM !== void 0 && _val$IVDosDurUOM._id && val !== null && val !== void 0 && (_val$IVDosDurUOM2 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM2 !== void 0 && _val$IVDosDurUOM2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM3 = val.IVDosDurUOM) === null || _val$IVDosDurUOM3 === void 0 ? void 0 : _val$IVDosDurUOM3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM4 = val.IVDosDurUOM) === null || _val$IVDosDurUOM4 === void 0 ? void 0 : _val$IVDosDurUOM4.display
+        } : {}), _defineProperty(_obj, "iv_dosage_duration_number", (_val$IVDosDurValue2 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue2 !== void 0 ? _val$IVDosDurValue2 : ""), _defineProperty(_obj, "iv_dosage_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM5 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM5 !== void 0 && _val$IVDosDurUOM5._id && val !== null && val !== void 0 && (_val$IVDosDurUOM6 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM6 !== void 0 && _val$IVDosDurUOM6.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM7 = val.IVDosDurUOM) === null || _val$IVDosDurUOM7 === void 0 ? void 0 : _val$IVDosDurUOM7._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM8 = val.IVDosDurUOM) === null || _val$IVDosDurUOM8 === void 0 ? void 0 : _val$IVDosDurUOM8.display
+        } : {}), _defineProperty(_obj, "dosage_freq_code", val !== null && val !== void 0 && (_val$dosageFreqCode = val.dosageFreqCode) !== null && _val$dosageFreqCode !== void 0 && _val$dosageFreqCode._id && val !== null && val !== void 0 && (_val$dosageFreqCode2 = val.dosageFreqCode) !== null && _val$dosageFreqCode2 !== void 0 && _val$dosageFreqCode2.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode3 = val.dosageFreqCode) === null || _val$dosageFreqCode3 === void 0 ? void 0 : _val$dosageFreqCode3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode4 = val.dosageFreqCode) === null || _val$dosageFreqCode4 === void 0 ? void 0 : _val$dosageFreqCode4.shortdesc
+        } : {}), _defineProperty(_obj, "startDay", (_val$startDay = val === null || val === void 0 ? void 0 : val.startDay) !== null && _val$startDay !== void 0 ? _val$startDay : ""), _defineProperty(_obj, "duration_number", (_val$dfltDuration = val === null || val === void 0 ? void 0 : val.dfltDuration) !== null && _val$dfltDuration !== void 0 ? _val$dfltDuration : ""), _defineProperty(_obj, "duration_type", val !== null && val !== void 0 && (_val$dfltDurUOM = val.dfltDurUOM) !== null && _val$dfltDurUOM !== void 0 && _val$dfltDurUOM._id && val !== null && val !== void 0 && (_val$dfltDurUOM2 = val.dfltDurUOM) !== null && _val$dfltDurUOM2 !== void 0 && _val$dfltDurUOM2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM3 = val.dfltDurUOM) === null || _val$dfltDurUOM3 === void 0 ? void 0 : _val$dfltDurUOM3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM4 = val.dfltDurUOM) === null || _val$dfltDurUOM4 === void 0 ? void 0 : _val$dfltDurUOM4.display
+        } : {}), _defineProperty(_obj, "durationT", val !== null && val !== void 0 && val.dfltDuration && val !== null && val !== void 0 && (_val$dfltDurUOM5 = val.dfltDurUOM) !== null && _val$dfltDurUOM5 !== void 0 && _val$dfltDurUOM5.display ? (val === null || val === void 0 ? void 0 : val.dfltDuration) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltDurUOM6 = val.dfltDurUOM) === null || _val$dfltDurUOM6 === void 0 ? void 0 : _val$dfltDurUOM6.display) : "-"), _defineProperty(_obj, "route", val !== null && val !== void 0 && (_val$route = val.route) !== null && _val$route !== void 0 && _val$route._id && val !== null && val !== void 0 && (_val$route2 = val.route) !== null && _val$route2 !== void 0 && _val$route2.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$route3 = val.route) === null || _val$route3 === void 0 ? void 0 : _val$route3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$route4 = val.route) === null || _val$route4 === void 0 ? void 0 : _val$route4.shortdesc
+        } : {}), _defineProperty(_obj, "routeT", (_val$route$shortdesc = val === null || val === void 0 ? void 0 : (_val$route5 = val.route) === null || _val$route5 === void 0 ? void 0 : _val$route5.shortdesc) !== null && _val$route$shortdesc !== void 0 ? _val$route$shortdesc : "-"), _defineProperty(_obj, "frequency_number", (_val$dfltFreqVal = val === null || val === void 0 ? void 0 : val.dfltFreqVal) !== null && _val$dfltFreqVal !== void 0 ? _val$dfltFreqVal : 0), _defineProperty(_obj, "frequency_type", val !== null && val !== void 0 && (_val$dfltFreqValUnit = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit !== void 0 && _val$dfltFreqValUnit._id && val !== null && val !== void 0 && (_val$dfltFreqValUnit2 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit2 !== void 0 && _val$dfltFreqValUnit2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit3 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit3 === void 0 ? void 0 : _val$dfltFreqValUnit3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit4 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit4 === void 0 ? void 0 : _val$dfltFreqValUnit4.display
+        } : {}), _defineProperty(_obj, "frequencyT", val !== null && val !== void 0 && val.dfltFreqVal && val !== null && val !== void 0 && (_val$dfltFreqValUnit5 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit5 !== void 0 && _val$dfltFreqValUnit5.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqVal) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit6 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit6 === void 0 ? void 0 : _val$dfltFreqValUnit6.display) : "-"), _defineProperty(_obj, "rate_number", (_val$dfltFreqRate = val === null || val === void 0 ? void 0 : val.dfltFreqRate) !== null && _val$dfltFreqRate !== void 0 ? _val$dfltFreqRate : ""), _defineProperty(_obj, "rate_type", val !== null && val !== void 0 && (_val$dfltFreqRateUnit = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit !== void 0 && _val$dfltFreqRateUnit._id && val !== null && val !== void 0 && (_val$dfltFreqRateUnit2 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit2 !== void 0 && _val$dfltFreqRateUnit2.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit3 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit3 === void 0 ? void 0 : _val$dfltFreqRateUnit3._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit4 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit4 === void 0 ? void 0 : _val$dfltFreqRateUnit4.display
+        } : {}), _defineProperty(_obj, "rateT", val !== null && val !== void 0 && val.dfltFreqRate && val !== null && val !== void 0 && (_val$dfltFreqRateUnit5 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit5 !== void 0 && _val$dfltFreqRateUnit5.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqRate) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit6 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit6 === void 0 ? void 0 : _val$dfltFreqRateUnit6.display) : "-"), _defineProperty(_obj, "additive", (_val$additive = val === null || val === void 0 ? void 0 : val.additive) !== null && _val$additive !== void 0 ? _val$additive : false), _defineProperty(_obj, "additivT", val !== null && val !== void 0 && val.additive ? (val === null || val === void 0 ? void 0 : val.additive) === true ? "Yes" : "No" : "No"), _defineProperty(_obj, "parentSequence", (_val$parentSequence = val === null || val === void 0 ? void 0 : val.parentSequence) !== null && _val$parentSequence !== void 0 ? _val$parentSequence : ""), _defineProperty(_obj, "parentSequenceT", (_val$parentSequence2 = val === null || val === void 0 ? void 0 : val.parentSequence) !== null && _val$parentSequence2 !== void 0 ? _val$parentSequence2 : "-"), _defineProperty(_obj, "explanatoryNote", (_val$explNote = val === null || val === void 0 ? void 0 : val.explNote) !== null && _val$explNote !== void 0 ? _val$explNote : ""), _defineProperty(_obj, "practitionerInstructions", (_val$practInstr = val === null || val === void 0 ? void 0 : val.practInstr) !== null && _val$practInstr !== void 0 ? _val$practInstr : ""), _defineProperty(_obj, "children", (_constructChildrenTab = constructChildrenTabelData(data, val === null || val === void 0 ? void 0 : val.seqNo)) !== null && _constructChildrenTab !== void 0 ? _constructChildrenTab : []), _obj);
+        arr.push(obj);
+      }
+    });
+  }
+
   return arr;
 };
 
 var constructChildrenTabelData = function constructChildrenTabelData(data, parentCatSeqNo) {
   var arr_ = [];
-  data === null || data === void 0 ? void 0 : data.map(function (val) {
-    if ((val === null || val === void 0 ? void 0 : val.parentCatSeqNo) === parentCatSeqNo) {
-      var _val$id2, _val$_key2, _val$orderCatalog$ord3, _val$orderCatalog15, _val$seqNo2, _val$orderCatalog$ord4, _val$orderCatalog16, _val$orderCatalog17, _val$orderCatalog18, _val$orderCatalog19, _val$orderCatalog20, _val$orderCatalog21, _val$orderCatalog21$o, _val$orderCatalog22, _val$orderCatalog22$o, _val$orderCatalog23, _val$orderCatalog23$o, _val$orderCatalog24, _val$orderCatalog24$o, _val$orderCatalog25, _val$orderCatalog25$o, _val$orderCatalog26, _val$orderCatalog26$o, _val$orderCatalog27, _val$orderCatalog27$o, _val$orderCatalog28, _val$orderCatalog28$o, _val$dfltOrderUOM7, _val$dfltOrderUOM8, _val$dfltOrderUOM9, _val$dfltOrderUOM10, _val$dfltOrderUOM11, _val$dfltOrderUOM12, _val$IVInfusRateVol2, _val$IVInfusRateVolUO5, _val$IVInfusRateVolUO6, _val$IVInfusRateVolUO7, _val$IVInfusRateVolUO8, _val$IVDosDurValue3, _val$IVDosDurUOM9, _val$IVDosDurUOM10, _val$IVDosDurUOM11, _val$IVDosDurUOM12, _val$IVDosDurValue4, _val$IVDosDurUOM13, _val$IVDosDurUOM14, _val$IVDosDurUOM15, _val$IVDosDurUOM16, _val$dosageFreqCode5, _val$dosageFreqCode6, _val$dosageFreqCode7, _val$dosageFreqCode8, _val$startDay2, _val$dfltDuration2, _val$dfltDurUOM7, _val$dfltDurUOM8, _val$dfltDurUOM9, _val$dfltDurUOM10, _val$dfltDurUOM11, _val$dfltDurUOM12, _val$route6, _val$route7, _val$route8, _val$route9, _val$route$shortdesc2, _val$route10, _val$dfltFreqVal2, _val$dfltFreqValUnit7, _val$dfltFreqValUnit8, _val$dfltFreqValUnit9, _val$dfltFreqValUnit10, _val$dfltFreqValUnit11, _val$dfltFreqValUnit12, _val$dfltFreqRate2, _val$dfltFreqRateUnit7, _val$dfltFreqRateUnit8, _val$dfltFreqRateUnit9, _val$dfltFreqRateUnit10, _val$dfltFreqRateUnit11, _val$dfltFreqRateUnit12, _val$additive2, _val$parentCatSeqNo, _val$parentCatSeqNo2, _val$explNote2, _val$practInstr2, _obj_;
-
-      var obj_ = (_obj_ = {
-        id: (_val$id2 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id2 !== void 0 ? _val$id2 : 0,
-        _key: (_val$_key2 = val === null || val === void 0 ? void 0 : val._key) !== null && _val$_key2 !== void 0 ? _val$_key2 : 0,
-        typeId: (_val$orderCatalog$ord3 = val === null || val === void 0 ? void 0 : (_val$orderCatalog15 = val.orderCatalog) === null || _val$orderCatalog15 === void 0 ? void 0 : _val$orderCatalog15.ordercategory._id) !== null && _val$orderCatalog$ord3 !== void 0 ? _val$orderCatalog$ord3 : "",
-        seqNo: (_val$seqNo2 = val === null || val === void 0 ? void 0 : val.seqNo) !== null && _val$seqNo2 !== void 0 ? _val$seqNo2 : "",
-        orderCategory: (_val$orderCatalog$ord4 = val === null || val === void 0 ? void 0 : (_val$orderCatalog16 = val.orderCatalog) === null || _val$orderCatalog16 === void 0 ? void 0 : _val$orderCatalog16.ordercategory) !== null && _val$orderCatalog$ord4 !== void 0 ? _val$orderCatalog$ord4 : {},
-        orderCatalog: val !== null && val !== void 0 && (_val$orderCatalog17 = val.orderCatalog) !== null && _val$orderCatalog17 !== void 0 && _val$orderCatalog17._id && val !== null && val !== void 0 && (_val$orderCatalog18 = val.orderCatalog) !== null && _val$orderCatalog18 !== void 0 && _val$orderCatalog18.shortdesc ? {
-          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog19 = val.orderCatalog) === null || _val$orderCatalog19 === void 0 ? void 0 : _val$orderCatalog19._id,
-          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog20 = val.orderCatalog) === null || _val$orderCatalog20 === void 0 ? void 0 : _val$orderCatalog20.shortdesc
-        } : {},
-        orderTypeDrugType: val !== null && val !== void 0 && (_val$orderCatalog21 = val.orderCatalog) !== null && _val$orderCatalog21 !== void 0 && (_val$orderCatalog21$o = _val$orderCatalog21.ordertype) !== null && _val$orderCatalog21$o !== void 0 && _val$orderCatalog21$o._id && val !== null && val !== void 0 && (_val$orderCatalog22 = val.orderCatalog) !== null && _val$orderCatalog22 !== void 0 && (_val$orderCatalog22$o = _val$orderCatalog22.ordertype) !== null && _val$orderCatalog22$o !== void 0 && _val$orderCatalog22$o.shortdesc ? {
-          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog23 = val.orderCatalog) === null || _val$orderCatalog23 === void 0 ? void 0 : (_val$orderCatalog23$o = _val$orderCatalog23.ordertype) === null || _val$orderCatalog23$o === void 0 ? void 0 : _val$orderCatalog23$o._id,
-          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog24 = val.orderCatalog) === null || _val$orderCatalog24 === void 0 ? void 0 : (_val$orderCatalog24$o = _val$orderCatalog24.ordertype) === null || _val$orderCatalog24$o === void 0 ? void 0 : _val$orderCatalog24$o.shortdesc
-        } : {}
-      }, _defineProperty(_obj_, "orderCategory", val !== null && val !== void 0 && (_val$orderCatalog25 = val.orderCatalog) !== null && _val$orderCatalog25 !== void 0 && (_val$orderCatalog25$o = _val$orderCatalog25.ordercategory) !== null && _val$orderCatalog25$o !== void 0 && _val$orderCatalog25$o._id && val !== null && val !== void 0 && (_val$orderCatalog26 = val.orderCatalog) !== null && _val$orderCatalog26 !== void 0 && (_val$orderCatalog26$o = _val$orderCatalog26.ordercategory) !== null && _val$orderCatalog26$o !== void 0 && _val$orderCatalog26$o.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$orderCatalog27 = val.orderCatalog) === null || _val$orderCatalog27 === void 0 ? void 0 : (_val$orderCatalog27$o = _val$orderCatalog27.ordercategory) === null || _val$orderCatalog27$o === void 0 ? void 0 : _val$orderCatalog27$o._id,
-        label: val === null || val === void 0 ? void 0 : (_val$orderCatalog28 = val.orderCatalog) === null || _val$orderCatalog28 === void 0 ? void 0 : (_val$orderCatalog28$o = _val$orderCatalog28.ordercategory) === null || _val$orderCatalog28$o === void 0 ? void 0 : _val$orderCatalog28$o.shortdesc
-      } : {}), _defineProperty(_obj_, "required", val !== null && val !== void 0 && val.required ? val === null || val === void 0 ? void 0 : val.required : false), _defineProperty(_obj_, "requiredT", val !== null && val !== void 0 && val.required ? (val === null || val === void 0 ? void 0 : val.required) === true ? "Yes" : "No" : "No"), _defineProperty(_obj_, "quantity_number", val !== null && val !== void 0 && val.dfltOrderQty ? val === null || val === void 0 ? void 0 : val.dfltOrderQty : ""), _defineProperty(_obj_, "quantity_type", val !== null && val !== void 0 && (_val$dfltOrderUOM7 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM7 !== void 0 && _val$dfltOrderUOM7._id && val !== null && val !== void 0 && (_val$dfltOrderUOM8 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM8 !== void 0 && _val$dfltOrderUOM8.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM9 = val.dfltOrderUOM) === null || _val$dfltOrderUOM9 === void 0 ? void 0 : _val$dfltOrderUOM9._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM10 = val.dfltOrderUOM) === null || _val$dfltOrderUOM10 === void 0 ? void 0 : _val$dfltOrderUOM10.display
-      } : {}), _defineProperty(_obj_, "quantityT", val !== null && val !== void 0 && (_val$dfltOrderUOM11 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM11 !== void 0 && _val$dfltOrderUOM11.display && val !== null && val !== void 0 && val.dfltOrderQty ? (val === null || val === void 0 ? void 0 : val.dfltOrderQty) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM12 = val.dfltOrderUOM) === null || _val$dfltOrderUOM12 === void 0 ? void 0 : _val$dfltOrderUOM12.display) : "-"), _defineProperty(_obj_, "in_infusion_rate_volume_number", (_val$IVInfusRateVol2 = val === null || val === void 0 ? void 0 : val.IVInfusRateVol) !== null && _val$IVInfusRateVol2 !== void 0 ? _val$IVInfusRateVol2 : ""), _defineProperty(_obj_, "in_infusion_rate_volume_type", val !== null && val !== void 0 && (_val$IVInfusRateVolUO5 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO5 !== void 0 && _val$IVInfusRateVolUO5._id && val !== null && val !== void 0 && (_val$IVInfusRateVolUO6 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO6 !== void 0 && _val$IVInfusRateVolUO6.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO7 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO7 === void 0 ? void 0 : _val$IVInfusRateVolUO7._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO8 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO8 === void 0 ? void 0 : _val$IVInfusRateVolUO8.display
-      } : {}), _defineProperty(_obj_, "in_infusion_rate_duration_number", (_val$IVDosDurValue3 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue3 !== void 0 ? _val$IVDosDurValue3 : ""), _defineProperty(_obj_, "in_infusion_rate_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM9 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM9 !== void 0 && _val$IVDosDurUOM9._id && val !== null && val !== void 0 && (_val$IVDosDurUOM10 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM10 !== void 0 && _val$IVDosDurUOM10.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM11 = val.IVDosDurUOM) === null || _val$IVDosDurUOM11 === void 0 ? void 0 : _val$IVDosDurUOM11._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM12 = val.IVDosDurUOM) === null || _val$IVDosDurUOM12 === void 0 ? void 0 : _val$IVDosDurUOM12.display
-      } : {}), _defineProperty(_obj_, "iv_dosage_duration_number", (_val$IVDosDurValue4 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue4 !== void 0 ? _val$IVDosDurValue4 : ""), _defineProperty(_obj_, "iv_dosage_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM13 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM13 !== void 0 && _val$IVDosDurUOM13._id && val !== null && val !== void 0 && (_val$IVDosDurUOM14 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM14 !== void 0 && _val$IVDosDurUOM14.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM15 = val.IVDosDurUOM) === null || _val$IVDosDurUOM15 === void 0 ? void 0 : _val$IVDosDurUOM15._id,
-        label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM16 = val.IVDosDurUOM) === null || _val$IVDosDurUOM16 === void 0 ? void 0 : _val$IVDosDurUOM16.display
-      } : {}), _defineProperty(_obj_, "dosage_freq_code", val !== null && val !== void 0 && (_val$dosageFreqCode5 = val.dosageFreqCode) !== null && _val$dosageFreqCode5 !== void 0 && _val$dosageFreqCode5._id && val !== null && val !== void 0 && (_val$dosageFreqCode6 = val.dosageFreqCode) !== null && _val$dosageFreqCode6 !== void 0 && _val$dosageFreqCode6.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode7 = val.dosageFreqCode) === null || _val$dosageFreqCode7 === void 0 ? void 0 : _val$dosageFreqCode7._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode8 = val.dosageFreqCode) === null || _val$dosageFreqCode8 === void 0 ? void 0 : _val$dosageFreqCode8.shortdesc
-      } : {}), _defineProperty(_obj_, "startDay", (_val$startDay2 = val === null || val === void 0 ? void 0 : val.startDay) !== null && _val$startDay2 !== void 0 ? _val$startDay2 : ""), _defineProperty(_obj_, "duration_number", (_val$dfltDuration2 = val === null || val === void 0 ? void 0 : val.dfltDuration) !== null && _val$dfltDuration2 !== void 0 ? _val$dfltDuration2 : ""), _defineProperty(_obj_, "duration_type", val !== null && val !== void 0 && (_val$dfltDurUOM7 = val.dfltDurUOM) !== null && _val$dfltDurUOM7 !== void 0 && _val$dfltDurUOM7._id && val !== null && val !== void 0 && (_val$dfltDurUOM8 = val.dfltDurUOM) !== null && _val$dfltDurUOM8 !== void 0 && _val$dfltDurUOM8.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM9 = val.dfltDurUOM) === null || _val$dfltDurUOM9 === void 0 ? void 0 : _val$dfltDurUOM9._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM10 = val.dfltDurUOM) === null || _val$dfltDurUOM10 === void 0 ? void 0 : _val$dfltDurUOM10.display
-      } : {}), _defineProperty(_obj_, "durationT", val !== null && val !== void 0 && val.dfltDuration && val !== null && val !== void 0 && (_val$dfltDurUOM11 = val.dfltDurUOM) !== null && _val$dfltDurUOM11 !== void 0 && _val$dfltDurUOM11.display ? (val === null || val === void 0 ? void 0 : val.dfltDuration) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltDurUOM12 = val.dfltDurUOM) === null || _val$dfltDurUOM12 === void 0 ? void 0 : _val$dfltDurUOM12.display) : "-"), _defineProperty(_obj_, "route", val !== null && val !== void 0 && (_val$route6 = val.route) !== null && _val$route6 !== void 0 && _val$route6._id && val !== null && val !== void 0 && (_val$route7 = val.route) !== null && _val$route7 !== void 0 && _val$route7.shortdesc ? {
-        value: val === null || val === void 0 ? void 0 : (_val$route8 = val.route) === null || _val$route8 === void 0 ? void 0 : _val$route8._id,
-        label: val === null || val === void 0 ? void 0 : (_val$route9 = val.route) === null || _val$route9 === void 0 ? void 0 : _val$route9.shortdesc
-      } : {}), _defineProperty(_obj_, "routeT", (_val$route$shortdesc2 = val === null || val === void 0 ? void 0 : (_val$route10 = val.route) === null || _val$route10 === void 0 ? void 0 : _val$route10.shortdesc) !== null && _val$route$shortdesc2 !== void 0 ? _val$route$shortdesc2 : "-"), _defineProperty(_obj_, "frequency_number", (_val$dfltFreqVal2 = val === null || val === void 0 ? void 0 : val.dfltFreqVal) !== null && _val$dfltFreqVal2 !== void 0 ? _val$dfltFreqVal2 : 0), _defineProperty(_obj_, "frequency_type", val !== null && val !== void 0 && (_val$dfltFreqValUnit7 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit7 !== void 0 && _val$dfltFreqValUnit7._id && val !== null && val !== void 0 && (_val$dfltFreqValUnit8 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit8 !== void 0 && _val$dfltFreqValUnit8.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit9 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit9 === void 0 ? void 0 : _val$dfltFreqValUnit9._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit10 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit10 === void 0 ? void 0 : _val$dfltFreqValUnit10.display
-      } : {}), _defineProperty(_obj_, "frequencyT", val !== null && val !== void 0 && val.dfltFreqVal && val !== null && val !== void 0 && (_val$dfltFreqValUnit11 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit11 !== void 0 && _val$dfltFreqValUnit11.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqVal) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit12 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit12 === void 0 ? void 0 : _val$dfltFreqValUnit12.display) : "-"), _defineProperty(_obj_, "rate_number", (_val$dfltFreqRate2 = val === null || val === void 0 ? void 0 : val.dfltFreqRate) !== null && _val$dfltFreqRate2 !== void 0 ? _val$dfltFreqRate2 : ""), _defineProperty(_obj_, "rate_type", val !== null && val !== void 0 && (_val$dfltFreqRateUnit7 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit7 !== void 0 && _val$dfltFreqRateUnit7._id && val !== null && val !== void 0 && (_val$dfltFreqRateUnit8 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit8 !== void 0 && _val$dfltFreqRateUnit8.display ? {
-        value: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit9 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit9 === void 0 ? void 0 : _val$dfltFreqRateUnit9._id,
-        label: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit10 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit10 === void 0 ? void 0 : _val$dfltFreqRateUnit10.display
-      } : {}), _defineProperty(_obj_, "rateT", val !== null && val !== void 0 && val.dfltFreqRate && val !== null && val !== void 0 && (_val$dfltFreqRateUnit11 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit11 !== void 0 && _val$dfltFreqRateUnit11.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqRate) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit12 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit12 === void 0 ? void 0 : _val$dfltFreqRateUnit12.display) : "-"), _defineProperty(_obj_, "additive", (_val$additive2 = val === null || val === void 0 ? void 0 : val.additive) !== null && _val$additive2 !== void 0 ? _val$additive2 : false), _defineProperty(_obj_, "additivT", val !== null && val !== void 0 && val.additive ? (val === null || val === void 0 ? void 0 : val.additive) === true ? "Yes" : "No" : "No"), _defineProperty(_obj_, "parentSequence", (_val$parentCatSeqNo = val === null || val === void 0 ? void 0 : val.parentCatSeqNo) !== null && _val$parentCatSeqNo !== void 0 ? _val$parentCatSeqNo : ""), _defineProperty(_obj_, "parentSequenceT", (_val$parentCatSeqNo2 = val === null || val === void 0 ? void 0 : val.parentCatSeqNo) !== null && _val$parentCatSeqNo2 !== void 0 ? _val$parentCatSeqNo2 : "-"), _defineProperty(_obj_, "explanatoryNote", (_val$explNote2 = val === null || val === void 0 ? void 0 : val.explNote) !== null && _val$explNote2 !== void 0 ? _val$explNote2 : ""), _defineProperty(_obj_, "practitionerInstructions", (_val$practInstr2 = val === null || val === void 0 ? void 0 : val.practInstr) !== null && _val$practInstr2 !== void 0 ? _val$practInstr2 : ""), _obj_);
-      arr_.push(obj_);
-    }
-  });
+
+  if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
+    data === null || data === void 0 ? void 0 : data.map(function (val) {
+      if ((val === null || val === void 0 ? void 0 : val.parentCatSeqNo) === parentCatSeqNo) {
+        var _val$id2, _val$_key2, _val$ordercategory$_i2, _val$seqNo2, _val$ordercategory6, _val$ordercategory7, _val$ordercategory8, _val$ordercategory9, _val$ordercategory10, _val$ordertype5, _val$ordertype6, _val$ordertype7, _val$ordertype8, _val$orderCatalog9, _val$orderCatalog10, _val$orderCatalog11, _val$orderCatalog12, _val$orderCatalog13, _val$orderCatalog14, _val$orderCatalog15, _val$orderCatalog16, _val$dfltOrderUOM7, _val$dfltOrderUOM8, _val$dfltOrderUOM9, _val$dfltOrderUOM10, _val$dfltOrderUOM11, _val$dfltOrderUOM12, _val$IVInfusRateVol2, _val$IVInfusRateVolUO5, _val$IVInfusRateVolUO6, _val$IVInfusRateVolUO7, _val$IVInfusRateVolUO8, _val$IVDosDurValue3, _val$IVDosDurUOM9, _val$IVDosDurUOM10, _val$IVDosDurUOM11, _val$IVDosDurUOM12, _val$IVDosDurValue4, _val$IVDosDurUOM13, _val$IVDosDurUOM14, _val$IVDosDurUOM15, _val$IVDosDurUOM16, _val$dosageFreqCode5, _val$dosageFreqCode6, _val$dosageFreqCode7, _val$dosageFreqCode8, _val$startDay2, _val$dfltDuration2, _val$dfltDurUOM7, _val$dfltDurUOM8, _val$dfltDurUOM9, _val$dfltDurUOM10, _val$dfltDurUOM11, _val$dfltDurUOM12, _val$route6, _val$route7, _val$route8, _val$route9, _val$route$shortdesc2, _val$route10, _val$dfltFreqVal2, _val$dfltFreqValUnit7, _val$dfltFreqValUnit8, _val$dfltFreqValUnit9, _val$dfltFreqValUnit10, _val$dfltFreqValUnit11, _val$dfltFreqValUnit12, _val$dfltFreqRate2, _val$dfltFreqRateUnit7, _val$dfltFreqRateUnit8, _val$dfltFreqRateUnit9, _val$dfltFreqRateUnit10, _val$dfltFreqRateUnit11, _val$dfltFreqRateUnit12, _val$additive2, _val$parentCatSeqNo, _val$parentCatSeqNo2, _val$explNote2, _val$practInstr2, _obj_;
+
+        var obj_ = (_obj_ = {
+          id: (_val$id2 = val === null || val === void 0 ? void 0 : val.id) !== null && _val$id2 !== void 0 ? _val$id2 : 0,
+          _key: (_val$_key2 = val === null || val === void 0 ? void 0 : val._key) !== null && _val$_key2 !== void 0 ? _val$_key2 : 0,
+          typeId: (_val$ordercategory$_i2 = val === null || val === void 0 ? void 0 : val.ordercategory._id) !== null && _val$ordercategory$_i2 !== void 0 ? _val$ordercategory$_i2 : "",
+          seqNo: (_val$seqNo2 = val === null || val === void 0 ? void 0 : val.seqNo) !== null && _val$seqNo2 !== void 0 ? _val$seqNo2 : "",
+          orderCategory: (_val$ordercategory6 = val === null || val === void 0 ? void 0 : val.ordercategory) !== null && _val$ordercategory6 !== void 0 ? _val$ordercategory6 : {}
+        }, _defineProperty(_obj_, "orderCategory", val !== null && val !== void 0 && (_val$ordercategory7 = val.ordercategory) !== null && _val$ordercategory7 !== void 0 && _val$ordercategory7._id && val !== null && val !== void 0 && (_val$ordercategory8 = val.ordercategory) !== null && _val$ordercategory8 !== void 0 && _val$ordercategory8.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$ordercategory9 = val.ordercategory) === null || _val$ordercategory9 === void 0 ? void 0 : _val$ordercategory9._id,
+          label: val === null || val === void 0 ? void 0 : (_val$ordercategory10 = val.ordercategory) === null || _val$ordercategory10 === void 0 ? void 0 : _val$ordercategory10.shortdesc
+        } : {}), _defineProperty(_obj_, "orderTypeDrugType", val !== null && val !== void 0 && (_val$ordertype5 = val.ordertype) !== null && _val$ordertype5 !== void 0 && _val$ordertype5._id && val !== null && val !== void 0 && (_val$ordertype6 = val.ordertype) !== null && _val$ordertype6 !== void 0 && _val$ordertype6.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$ordertype7 = val.ordertype) === null || _val$ordertype7 === void 0 ? void 0 : _val$ordertype7._id,
+          label: val === null || val === void 0 ? void 0 : (_val$ordertype8 = val.ordertype) === null || _val$ordertype8 === void 0 ? void 0 : _val$ordertype8.shortdesc
+        } : {}), _defineProperty(_obj_, "orderCatalog", val !== null && val !== void 0 && (_val$orderCatalog9 = val.orderCatalog) !== null && _val$orderCatalog9 !== void 0 && _val$orderCatalog9._id && val !== null && val !== void 0 && (_val$orderCatalog10 = val.orderCatalog) !== null && _val$orderCatalog10 !== void 0 && _val$orderCatalog10.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog11 = val.orderCatalog) === null || _val$orderCatalog11 === void 0 ? void 0 : _val$orderCatalog11._id,
+          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog12 = val.orderCatalog) === null || _val$orderCatalog12 === void 0 ? void 0 : _val$orderCatalog12.shortdesc
+        } : val !== null && val !== void 0 && (_val$orderCatalog13 = val.orderCatalog) !== null && _val$orderCatalog13 !== void 0 && _val$orderCatalog13._id && val !== null && val !== void 0 && (_val$orderCatalog14 = val.orderCatalog) !== null && _val$orderCatalog14 !== void 0 && _val$orderCatalog14.ShortDesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$orderCatalog15 = val.orderCatalog) === null || _val$orderCatalog15 === void 0 ? void 0 : _val$orderCatalog15._id,
+          label: val === null || val === void 0 ? void 0 : (_val$orderCatalog16 = val.orderCatalog) === null || _val$orderCatalog16 === void 0 ? void 0 : _val$orderCatalog16.ShortDesc
+        } : {}), _defineProperty(_obj_, "required", val !== null && val !== void 0 && val.required ? val === null || val === void 0 ? void 0 : val.required : false), _defineProperty(_obj_, "requiredT", val !== null && val !== void 0 && val.required ? (val === null || val === void 0 ? void 0 : val.required) === true ? "Yes" : "No" : "No"), _defineProperty(_obj_, "quantity_number", val !== null && val !== void 0 && val.dfltOrderQty ? val === null || val === void 0 ? void 0 : val.dfltOrderQty : ""), _defineProperty(_obj_, "quantity_type", val !== null && val !== void 0 && (_val$dfltOrderUOM7 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM7 !== void 0 && _val$dfltOrderUOM7._id && val !== null && val !== void 0 && (_val$dfltOrderUOM8 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM8 !== void 0 && _val$dfltOrderUOM8.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM9 = val.dfltOrderUOM) === null || _val$dfltOrderUOM9 === void 0 ? void 0 : _val$dfltOrderUOM9._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM10 = val.dfltOrderUOM) === null || _val$dfltOrderUOM10 === void 0 ? void 0 : _val$dfltOrderUOM10.display
+        } : {}), _defineProperty(_obj_, "quantityT", val !== null && val !== void 0 && (_val$dfltOrderUOM11 = val.dfltOrderUOM) !== null && _val$dfltOrderUOM11 !== void 0 && _val$dfltOrderUOM11.display && val !== null && val !== void 0 && val.dfltOrderQty ? (val === null || val === void 0 ? void 0 : val.dfltOrderQty) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltOrderUOM12 = val.dfltOrderUOM) === null || _val$dfltOrderUOM12 === void 0 ? void 0 : _val$dfltOrderUOM12.display) : "-"), _defineProperty(_obj_, "in_infusion_rate_volume_number", (_val$IVInfusRateVol2 = val === null || val === void 0 ? void 0 : val.IVInfusRateVol) !== null && _val$IVInfusRateVol2 !== void 0 ? _val$IVInfusRateVol2 : ""), _defineProperty(_obj_, "in_infusion_rate_volume_type", val !== null && val !== void 0 && (_val$IVInfusRateVolUO5 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO5 !== void 0 && _val$IVInfusRateVolUO5._id && val !== null && val !== void 0 && (_val$IVInfusRateVolUO6 = val.IVInfusRateVolUOM) !== null && _val$IVInfusRateVolUO6 !== void 0 && _val$IVInfusRateVolUO6.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO7 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO7 === void 0 ? void 0 : _val$IVInfusRateVolUO7._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVInfusRateVolUO8 = val.IVInfusRateVolUOM) === null || _val$IVInfusRateVolUO8 === void 0 ? void 0 : _val$IVInfusRateVolUO8.display
+        } : {}), _defineProperty(_obj_, "in_infusion_rate_duration_number", (_val$IVDosDurValue3 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue3 !== void 0 ? _val$IVDosDurValue3 : ""), _defineProperty(_obj_, "in_infusion_rate_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM9 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM9 !== void 0 && _val$IVDosDurUOM9._id && val !== null && val !== void 0 && (_val$IVDosDurUOM10 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM10 !== void 0 && _val$IVDosDurUOM10.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM11 = val.IVDosDurUOM) === null || _val$IVDosDurUOM11 === void 0 ? void 0 : _val$IVDosDurUOM11._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM12 = val.IVDosDurUOM) === null || _val$IVDosDurUOM12 === void 0 ? void 0 : _val$IVDosDurUOM12.display
+        } : {}), _defineProperty(_obj_, "iv_dosage_duration_number", (_val$IVDosDurValue4 = val === null || val === void 0 ? void 0 : val.IVDosDurValue) !== null && _val$IVDosDurValue4 !== void 0 ? _val$IVDosDurValue4 : ""), _defineProperty(_obj_, "iv_dosage_duration_type", val !== null && val !== void 0 && (_val$IVDosDurUOM13 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM13 !== void 0 && _val$IVDosDurUOM13._id && val !== null && val !== void 0 && (_val$IVDosDurUOM14 = val.IVDosDurUOM) !== null && _val$IVDosDurUOM14 !== void 0 && _val$IVDosDurUOM14.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM15 = val.IVDosDurUOM) === null || _val$IVDosDurUOM15 === void 0 ? void 0 : _val$IVDosDurUOM15._id,
+          label: val === null || val === void 0 ? void 0 : (_val$IVDosDurUOM16 = val.IVDosDurUOM) === null || _val$IVDosDurUOM16 === void 0 ? void 0 : _val$IVDosDurUOM16.display
+        } : {}), _defineProperty(_obj_, "dosage_freq_code", val !== null && val !== void 0 && (_val$dosageFreqCode5 = val.dosageFreqCode) !== null && _val$dosageFreqCode5 !== void 0 && _val$dosageFreqCode5._id && val !== null && val !== void 0 && (_val$dosageFreqCode6 = val.dosageFreqCode) !== null && _val$dosageFreqCode6 !== void 0 && _val$dosageFreqCode6.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode7 = val.dosageFreqCode) === null || _val$dosageFreqCode7 === void 0 ? void 0 : _val$dosageFreqCode7._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dosageFreqCode8 = val.dosageFreqCode) === null || _val$dosageFreqCode8 === void 0 ? void 0 : _val$dosageFreqCode8.shortdesc
+        } : {}), _defineProperty(_obj_, "startDay", (_val$startDay2 = val === null || val === void 0 ? void 0 : val.startDay) !== null && _val$startDay2 !== void 0 ? _val$startDay2 : ""), _defineProperty(_obj_, "duration_number", (_val$dfltDuration2 = val === null || val === void 0 ? void 0 : val.dfltDuration) !== null && _val$dfltDuration2 !== void 0 ? _val$dfltDuration2 : ""), _defineProperty(_obj_, "duration_type", val !== null && val !== void 0 && (_val$dfltDurUOM7 = val.dfltDurUOM) !== null && _val$dfltDurUOM7 !== void 0 && _val$dfltDurUOM7._id && val !== null && val !== void 0 && (_val$dfltDurUOM8 = val.dfltDurUOM) !== null && _val$dfltDurUOM8 !== void 0 && _val$dfltDurUOM8.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM9 = val.dfltDurUOM) === null || _val$dfltDurUOM9 === void 0 ? void 0 : _val$dfltDurUOM9._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltDurUOM10 = val.dfltDurUOM) === null || _val$dfltDurUOM10 === void 0 ? void 0 : _val$dfltDurUOM10.display
+        } : {}), _defineProperty(_obj_, "durationT", val !== null && val !== void 0 && val.dfltDuration && val !== null && val !== void 0 && (_val$dfltDurUOM11 = val.dfltDurUOM) !== null && _val$dfltDurUOM11 !== void 0 && _val$dfltDurUOM11.display ? (val === null || val === void 0 ? void 0 : val.dfltDuration) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltDurUOM12 = val.dfltDurUOM) === null || _val$dfltDurUOM12 === void 0 ? void 0 : _val$dfltDurUOM12.display) : "-"), _defineProperty(_obj_, "route", val !== null && val !== void 0 && (_val$route6 = val.route) !== null && _val$route6 !== void 0 && _val$route6._id && val !== null && val !== void 0 && (_val$route7 = val.route) !== null && _val$route7 !== void 0 && _val$route7.shortdesc ? {
+          value: val === null || val === void 0 ? void 0 : (_val$route8 = val.route) === null || _val$route8 === void 0 ? void 0 : _val$route8._id,
+          label: val === null || val === void 0 ? void 0 : (_val$route9 = val.route) === null || _val$route9 === void 0 ? void 0 : _val$route9.shortdesc
+        } : {}), _defineProperty(_obj_, "routeT", (_val$route$shortdesc2 = val === null || val === void 0 ? void 0 : (_val$route10 = val.route) === null || _val$route10 === void 0 ? void 0 : _val$route10.shortdesc) !== null && _val$route$shortdesc2 !== void 0 ? _val$route$shortdesc2 : "-"), _defineProperty(_obj_, "frequency_number", (_val$dfltFreqVal2 = val === null || val === void 0 ? void 0 : val.dfltFreqVal) !== null && _val$dfltFreqVal2 !== void 0 ? _val$dfltFreqVal2 : 0), _defineProperty(_obj_, "frequency_type", val !== null && val !== void 0 && (_val$dfltFreqValUnit7 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit7 !== void 0 && _val$dfltFreqValUnit7._id && val !== null && val !== void 0 && (_val$dfltFreqValUnit8 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit8 !== void 0 && _val$dfltFreqValUnit8.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit9 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit9 === void 0 ? void 0 : _val$dfltFreqValUnit9._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit10 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit10 === void 0 ? void 0 : _val$dfltFreqValUnit10.display
+        } : {}), _defineProperty(_obj_, "frequencyT", val !== null && val !== void 0 && val.dfltFreqVal && val !== null && val !== void 0 && (_val$dfltFreqValUnit11 = val.dfltFreqValUnit) !== null && _val$dfltFreqValUnit11 !== void 0 && _val$dfltFreqValUnit11.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqVal) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqValUnit12 = val.dfltFreqValUnit) === null || _val$dfltFreqValUnit12 === void 0 ? void 0 : _val$dfltFreqValUnit12.display) : "-"), _defineProperty(_obj_, "rate_number", (_val$dfltFreqRate2 = val === null || val === void 0 ? void 0 : val.dfltFreqRate) !== null && _val$dfltFreqRate2 !== void 0 ? _val$dfltFreqRate2 : ""), _defineProperty(_obj_, "rate_type", val !== null && val !== void 0 && (_val$dfltFreqRateUnit7 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit7 !== void 0 && _val$dfltFreqRateUnit7._id && val !== null && val !== void 0 && (_val$dfltFreqRateUnit8 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit8 !== void 0 && _val$dfltFreqRateUnit8.display ? {
+          value: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit9 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit9 === void 0 ? void 0 : _val$dfltFreqRateUnit9._id,
+          label: val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit10 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit10 === void 0 ? void 0 : _val$dfltFreqRateUnit10.display
+        } : {}), _defineProperty(_obj_, "rateT", val !== null && val !== void 0 && val.dfltFreqRate && val !== null && val !== void 0 && (_val$dfltFreqRateUnit11 = val.dfltFreqRateUnit) !== null && _val$dfltFreqRateUnit11 !== void 0 && _val$dfltFreqRateUnit11.display ? (val === null || val === void 0 ? void 0 : val.dfltFreqRate) + " " + (val === null || val === void 0 ? void 0 : (_val$dfltFreqRateUnit12 = val.dfltFreqRateUnit) === null || _val$dfltFreqRateUnit12 === void 0 ? void 0 : _val$dfltFreqRateUnit12.display) : "-"), _defineProperty(_obj_, "additive", (_val$additive2 = val === null || val === void 0 ? void 0 : val.additive) !== null && _val$additive2 !== void 0 ? _val$additive2 : false), _defineProperty(_obj_, "additivT", val !== null && val !== void 0 && val.additive ? (val === null || val === void 0 ? void 0 : val.additive) === true ? "Yes" : "No" : "No"), _defineProperty(_obj_, "parentSequence", (_val$parentCatSeqNo = val === null || val === void 0 ? void 0 : val.parentCatSeqNo) !== null && _val$parentCatSeqNo !== void 0 ? _val$parentCatSeqNo : ""), _defineProperty(_obj_, "parentSequenceT", (_val$parentCatSeqNo2 = val === null || val === void 0 ? void 0 : val.parentCatSeqNo) !== null && _val$parentCatSeqNo2 !== void 0 ? _val$parentCatSeqNo2 : "-"), _defineProperty(_obj_, "explanatoryNote", (_val$explNote2 = val === null || val === void 0 ? void 0 : val.explNote) !== null && _val$explNote2 !== void 0 ? _val$explNote2 : ""), _defineProperty(_obj_, "practitionerInstructions", (_val$practInstr2 = val === null || val === void 0 ? void 0 : val.practInstr) !== null && _val$practInstr2 !== void 0 ? _val$practInstr2 : ""), _obj_);
+        arr_.push(obj_);
+      }
+    });
+  }
+
   return arr_;
 };
 
@@ -30156,9 +30269,9 @@ var ORDER_CATEGORY_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_categ
       }
     }
   }, _callee7, null, [[2, 12]]);
-}))); //ORDER_DRUG_MASTER
+}))); //ORDER__MASTER
 
-var ORDER_DRUG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_drug_master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+var ORDER__MASTER = createAsyncThunk("orderSetMasterApiSlice/order__master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
   var payload,
       _ref13,
       rejectWithValue,
@@ -30209,14 +30322,12 @@ var ORDER_DRUG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_drug_mast
       }
     }
   }, _callee8, null, [[2, 13]]);
-}))); //ORDER_DRUG_CATALOG_MASTER
+}))); //DRUG__MASTER
 
-var ORDER_DRUG_CATALOG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_drug_catalog_master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
+var DRUG__MASTER = createAsyncThunk("orderSetMasterApiSlice/drug__master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
   var payload,
       _ref15,
       rejectWithValue,
-      order_category,
-      order_drug_type,
       data_arr,
       arry,
       _args9 = arguments;
@@ -30228,10 +30339,12 @@ var ORDER_DRUG_CATALOG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_d
           payload = _args9.length > 0 && _args9[0] !== undefined ? _args9[0] : {};
           _ref15 = _args9.length > 1 ? _args9[1] : undefined, rejectWithValue = _ref15.rejectWithValue;
           _context9.prev = 2;
-          order_category = payload.order_category, order_drug_type = payload.order_drug_type;
+
+          _objectDestructuringEmpty(payload);
+
           _context9.next = 6;
           return fetchData({
-            body: JSON.stringify(dynamicMaster$1.orderDrugCatalog(order_category, order_drug_type))
+            body: JSON.stringify(dynamicMaster$1.drugType())
           }, __readDocumentUrl__);
 
         case 6:
@@ -30241,30 +30354,143 @@ var ORDER_DRUG_CATALOG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order_d
           return data_arr.result.map(function (val) {
             arry.push({
               value: val._id,
-              label: val.shortdesc,
-              freqApplicable: val !== null && val !== void 0 && val.OrderCatalogByEncounterTypeAge ? constOrderCatalogByEncounterTypeAge(val === null || val === void 0 ? void 0 : val.OrderCatalogByEncounterTypeAge) : false
+              label: val.shortdesc
             });
           });
 
         case 10:
-          debugger;
           return _context9.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: arry
           }));
 
-        case 14:
-          _context9.prev = 14;
+        case 13:
+          _context9.prev = 13;
           _context9.t0 = _context9["catch"](2);
           return _context9.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
             message: _context9.t0.message
           })));
 
-        case 17:
+        case 16:
         case "end":
           return _context9.stop();
       }
     }
-  }, _callee9, null, [[2, 14]]);
+  }, _callee9, null, [[2, 13]]);
+}))); //ORDER__CATALOG_MASTER
+
+var ORDER__CATALOG_MASTER = createAsyncThunk("orderSetMasterApiSlice/order__catalog_master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+  var payload,
+      _ref17,
+      rejectWithValue,
+      order_category,
+      order_drug_type,
+      data_arr,
+      arry,
+      _args10 = arguments;
+
+  return regeneratorRuntime.wrap(function _callee10$(_context10) {
+    while (1) {
+      switch (_context10.prev = _context10.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;
+          order_category = payload.order_category, order_drug_type = payload.order_drug_type;
+          _context10.next = 6;
+          return fetchData({
+            body: JSON.stringify(dynamicMaster$1.orderCatalog(order_category, order_drug_type))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data_arr = _context10.sent;
+          arry = [];
+          _context10.next = 10;
+          return data_arr.result.map(function (val) {
+            arry.push({
+              value: val._id,
+              label: val.shortdesc,
+              freqApplicable: val !== null && val !== void 0 && val.OrderCatalogByEncounterTypeAge ? constOrderCatalogByEncounterTypeAge(val === null || val === void 0 ? void 0 : val.OrderCatalogByEncounterTypeAge) : false
+            });
+          });
+
+        case 10:
+          debugger;
+          return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: arry
+          }));
+
+        case 14:
+          _context10.prev = 14;
+          _context10.t0 = _context10["catch"](2);
+          return _context10.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context10.t0.message
+          })));
+
+        case 17:
+        case "end":
+          return _context10.stop();
+      }
+    }
+  }, _callee10, null, [[2, 14]]);
+}))); //DRUG__CATALOG_MASTER
+
+var DRUG__CATALOG_MASTER = createAsyncThunk("orderSetMasterApiSlice/drug__catalog_master", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+  var payload,
+      _ref19,
+      rejectWithValue,
+      drug_type,
+      data_arr,
+      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;
+          drug_type = payload.drug_type;
+          _context11.next = 6;
+          return fetchData({
+            body: JSON.stringify(dynamicMaster$1.drugCatalog(drug_type))
+          }, __readDocumentUrl__);
+
+        case 6:
+          data_arr = _context11.sent;
+          arry = [];
+          _context11.next = 10;
+          return data_arr.result.map(function (val) {
+            arry.push({
+              value: val === null || val === void 0 ? void 0 : val._id,
+              label: val === null || val === void 0 ? void 0 : val.ShortDesc // freqApplicable: val?.OrderCatalogByEncounterTypeAge
+              //   ? constOrderCatalogByEncounterTypeAge(
+              //       val?.OrderCatalogByEncounterTypeAge
+              //     )
+              //   : false,
+
+            });
+          });
+
+        case 10:
+          debugger;
+          return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: arry
+          }));
+
+        case 14:
+          _context11.prev = 14;
+          _context11.t0 = _context11["catch"](2);
+          return _context11.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context11.t0.message
+          })));
+
+        case 17:
+        case "end":
+          return _context11.stop();
+      }
+    }
+  }, _callee11, null, [[2, 14]]);
 })));
 
 var constOrderCatalogByEncounterTypeAge = function constOrderCatalogByEncounterTypeAge(data) {
@@ -30284,137 +30510,135 @@ var constOrderCatalogByEncounterTypeAge = function constOrderCatalogByEncounterT
 }; //UPSERT_ORDER_SET
 
 
-var UPSERT_ORDER_SET = createAsyncThunk("orderSetMasterApiSlice/order_set_upsertS", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+var UPSERT_ORDER_SET = createAsyncThunk("orderSetMasterApiSlice/order_set_upsertS", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
   var payload,
-      _ref17,
+      _ref21,
       rejectWithValue,
       dataList,
       queriesjson,
       data,
-      _args10 = arguments;
+      _args12 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee10$(_context10) {
+  return regeneratorRuntime.wrap(function _callee12$(_context12) {
     while (1) {
-      switch (_context10.prev = _context10.next) {
+      switch (_context12.prev = _context12.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 = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
+          _ref21 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref21.rejectWithValue;
+          _context12.prev = 2;
           dataList = payload.dataList;
           queriesjson = generateJson$2(dataList);
-          _context10.next = 7;
+          _context12.next = 7;
           return fetchData({
             body: JSON.stringify(queriesjson)
           }, __uspsertUrl__);
 
         case 7:
-          data = _context10.sent;
-          return _context10.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context12.sent;
+          return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
         case 11:
-          _context10.prev = 11;
-          _context10.t0 = _context10["catch"](2);
-          return _context10.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context10.t0.message
+          _context12.prev = 11;
+          _context12.t0 = _context12["catch"](2);
+          return _context12.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context12.t0.message
           })));
 
         case 14:
         case "end":
-          return _context10.stop();
+          return _context12.stop();
       }
     }
-  }, _callee10, null, [[2, 11]]);
+  }, _callee12, null, [[2, 11]]);
 }))); //ORDER_SET_SINGLE_READ
 
-var ORDER_SET_SINGLE_READ = createAsyncThunk("orderSetMasterApiSlice/order_set_single_read", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+var ORDER_SET_SINGLE_READ = createAsyncThunk("orderSetMasterApiSlice/order_set_single_read", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
   var payload,
-      _ref19,
+      _ref23,
       rejectWithValue,
-      getState,
       _key,
       data,
       readJSON,
-      _args11 = arguments;
+      _args13 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee11$(_context11) {
+  return regeneratorRuntime.wrap(function _callee13$(_context13) {
     while (1) {
-      switch (_context11.prev = _context11.next) {
+      switch (_context13.prev = _context13.next) {
         case 0:
-          payload = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : {};
-          _ref19 = _args11.length > 1 ? _args11[1] : undefined, rejectWithValue = _ref19.rejectWithValue, getState = _ref19.getState;
-          _context11.prev = 2;
+          payload = _args13.length > 0 && _args13[0] !== undefined ? _args13[0] : {};
+          _ref23 = _args13.length > 1 ? _args13[1] : undefined, rejectWithValue = _ref23.rejectWithValue;
+          _context13.prev = 2;
           _key = payload._key;
-          getState();
-          _context11.next = 8;
+          _context13.next = 6;
           return fetchData({
             body: JSON.stringify(query$3.orderSetListById(_key))
           }, __readDocumentUrl__);
 
-        case 8:
-          data = _context11.sent;
+        case 6:
+          data = _context13.sent;
           readJSON = generateReadJSON$2(data.result[0] ? data.result[0] : null);
-          return _context11.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          return _context13.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: readJSON
           }));
 
-        case 13:
-          _context11.prev = 13;
-          _context11.t0 = _context11["catch"](2);
-          alert(_context11.t0.message);
-          return _context11.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context11.t0.message
+        case 11:
+          _context13.prev = 11;
+          _context13.t0 = _context13["catch"](2);
+          alert(_context13.t0.message);
+          return _context13.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context13.t0.message
           })));
 
-        case 17:
+        case 15:
         case "end":
-          return _context11.stop();
+          return _context13.stop();
       }
     }
-  }, _callee11, null, [[2, 13]]);
+  }, _callee13, null, [[2, 11]]);
 }))); //DELETE_ORDER_SET_COMPONENT
 
-var DELETE_ORDER_SET_COMPONENT = createAsyncThunk("orderSetMasterApiSlice/order_set_component_delete", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
+var DELETE_ORDER_SET_COMPONENT = createAsyncThunk("orderSetMasterApiSlice/order_set_component_delete", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
   var payload,
-      _ref21,
+      _ref25,
       rejectWithValue,
       _key,
       data,
-      _args12 = arguments;
+      _args14 = arguments;
 
-  return regeneratorRuntime.wrap(function _callee12$(_context12) {
+  return regeneratorRuntime.wrap(function _callee14$(_context14) {
     while (1) {
-      switch (_context12.prev = _context12.next) {
+      switch (_context14.prev = _context14.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 = _args14.length > 0 && _args14[0] !== undefined ? _args14[0] : {};
+          _ref25 = _args14.length > 1 ? _args14[1] : undefined, rejectWithValue = _ref25.rejectWithValue;
+          _context14.prev = 2;
           _key = payload._key;
-          _context12.next = 6;
+          _context14.next = 6;
           return fetchData({
             body: JSON.stringify(query$3.orderSetComponentDelete(_key))
           }, __softDelete__);
 
         case 6:
-          data = _context12.sent;
-          return _context12.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+          data = _context14.sent;
+          return _context14.abrupt("return", _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
             data: data
           }));
 
         case 10:
-          _context12.prev = 10;
-          _context12.t0 = _context12["catch"](2);
-          return _context12.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-            message: _context12.t0.message
+          _context14.prev = 10;
+          _context14.t0 = _context14["catch"](2);
+          return _context14.abrupt("return", rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _context14.t0.message
           })));
 
         case 13:
         case "end":
-          return _context12.stop();
+          return _context14.stop();
       }
     }
-  }, _callee12, null, [[2, 10]]);
+  }, _callee14, null, [[2, 10]]);
 })));
 var orderSetMasterSlice = createSlice({
   name: "orderSetMasterApiSlice",
@@ -30423,8 +30647,10 @@ var orderSetMasterSlice = createSlice({
     order_set_single_read: _objectSpread2({}, defaultState.List),
     order_set_master_status_change: _objectSpread2({}, defaultState.List),
     order_set_masters: _objectSpread2({}, defaultState.List),
-    order_drug_masters: _objectSpread2({}, defaultState.List),
-    order_drug_catalog_masters: _objectSpread2({}, defaultState.List),
+    order__masters: _objectSpread2({}, defaultState.List),
+    drug__masters: _objectSpread2({}, defaultState.List),
+    order__catalog_masters: _objectSpread2({}, defaultState.List),
+    drug__catalog_masters: _objectSpread2({}, defaultState.List),
     order_category_masters: _objectSpread2({}, defaultState.List),
     order_set_upsert: _objectSpread2({}, defaultState.List),
     order_set_component_delete: _objectSpread2({}, defaultState.List)
@@ -30459,18 +30685,30 @@ var orderSetMasterSlice = createSlice({
     state.order_set_masters.loading = true, state.order_set_masters.error = false, state.order_set_masters.loading = true;
   }), _defineProperty(_extraReducers$8, ORDER_SET_MASTER_MASTER.rejected, function (state, action) {
     state.order_set_masters.loading = false, state.order_set_masters.error = true, state.order_set_masters = action.payload;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_MASTER.fulfilled, function (state, action) {
-    state.order_drug_masters.loading = false, state.order_drug_masters.error = false, state.order_drug_masters = action.payload;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_MASTER.pending, function (state, action) {
-    state.order_drug_masters.loading = true, state.order_drug_masters.error = false, state.order_drug_masters.loading = true;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_MASTER.rejected, function (state, action) {
-    state.order_drug_masters.loading = false, state.order_drug_masters.error = true, state.order_drug_masters = action.payload;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_CATALOG_MASTER.fulfilled, function (state, action) {
-    state.order_drug_catalog_masters.loading = false, state.order_drug_catalog_masters.error = false, state.order_drug_catalog_masters = action.payload;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_CATALOG_MASTER.pending, function (state, action) {
-    state.order_drug_catalog_masters.loading = true, state.order_drug_catalog_masters.error = false, state.order_drug_catalog_masters.loading = true;
-  }), _defineProperty(_extraReducers$8, ORDER_DRUG_CATALOG_MASTER.rejected, function (state, action) {
-    state.order_drug_catalog_masters.loading = false, state.order_drug_catalog_masters.error = true, state.order_drug_catalog_masters = action.payload;
+  }), _defineProperty(_extraReducers$8, ORDER__MASTER.fulfilled, function (state, action) {
+    state.order__masters.loading = false, state.order__masters.error = false, state.order__masters = action.payload;
+  }), _defineProperty(_extraReducers$8, ORDER__MASTER.pending, function (state, action) {
+    state.order__masters.loading = true, state.order__masters.error = false, state.order__masters.loading = true;
+  }), _defineProperty(_extraReducers$8, ORDER__MASTER.rejected, function (state, action) {
+    state.order__masters.loading = false, state.order__masters.error = true, state.order__masters = action.payload;
+  }), _defineProperty(_extraReducers$8, DRUG__MASTER.fulfilled, function (state, action) {
+    state.drug__masters.loading = false, state.drug__masters.error = false, state.drug__masters = action.payload;
+  }), _defineProperty(_extraReducers$8, DRUG__MASTER.pending, function (state, action) {
+    state.drug__masters.loading = true, state.drug__masters.error = false, state.drug__masters.loading = true;
+  }), _defineProperty(_extraReducers$8, DRUG__MASTER.rejected, function (state, action) {
+    state.drug__masters.loading = false, state.drug__masters.error = true, state.drug__masters = action.payload;
+  }), _defineProperty(_extraReducers$8, ORDER__CATALOG_MASTER.fulfilled, function (state, action) {
+    state.order__catalog_masters.loading = false, state.order__catalog_masters.error = false, state.order__catalog_masters = action.payload;
+  }), _defineProperty(_extraReducers$8, ORDER__CATALOG_MASTER.pending, function (state, action) {
+    state.order__catalog_masters.loading = true, state.order__catalog_masters.error = false, state.order__catalog_masters.loading = true;
+  }), _defineProperty(_extraReducers$8, ORDER__CATALOG_MASTER.rejected, function (state, action) {
+    state.order__catalog_masters.loading = false, state.order__catalog_masters.error = true, state.order__catalog_masters = action.payload;
+  }), _defineProperty(_extraReducers$8, DRUG__CATALOG_MASTER.fulfilled, function (state, action) {
+    state.drug__catalog_masters.loading = false, state.drug__catalog_masters.error = false, state.drug__catalog_masters = action.payload;
+  }), _defineProperty(_extraReducers$8, DRUG__CATALOG_MASTER.pending, function (state, action) {
+    state.drug__catalog_masters.loading = true, state.drug__catalog_masters.error = false, state.drug__catalog_masters.loading = true;
+  }), _defineProperty(_extraReducers$8, DRUG__CATALOG_MASTER.rejected, function (state, action) {
+    state.drug__catalog_masters.loading = false, state.drug__catalog_masters.error = true, state.drug__catalog_masters = action.payload;
   }), _defineProperty(_extraReducers$8, ORDER_CATEGORY_MASTER.fulfilled, function (state, action) {
     state.order_category_masters.loading = false, state.order_category_masters.error = false, state.order_category_masters = action.payload;
   }), _defineProperty(_extraReducers$8, ORDER_CATEGORY_MASTER.pending, function (state, action) {
@@ -30495,8 +30733,10 @@ var orderSetMasterActions = {
   GET_ORDER_SET_LIST: GET_ORDER_SET_LIST,
   ORDER_SET_MASTER_STATUS_CHANGE: ORDER_SET_MASTER_STATUS_CHANGE,
   ORDER_SET_MASTER_MASTER: ORDER_SET_MASTER_MASTER,
-  ORDER_DRUG_MASTER: ORDER_DRUG_MASTER,
-  ORDER_DRUG_CATALOG_MASTER: ORDER_DRUG_CATALOG_MASTER,
+  ORDER__MASTER: ORDER__MASTER,
+  DRUG__MASTER: DRUG__MASTER,
+  ORDER__CATALOG_MASTER: ORDER__CATALOG_MASTER,
+  DRUG__CATALOG_MASTER: DRUG__CATALOG_MASTER,
   ORDER_CATEGORY_MASTER: ORDER_CATEGORY_MASTER,
   UPSERT_ORDER_SET: UPSERT_ORDER_SET,
   ORDER_SET_SINGLE_READ: ORDER_SET_SINGLE_READ,
@@ -31492,7 +31732,7 @@ var VIEW_PENDING_PATIENT_LIST = createAsyncThunk("getPendingRescheduleListApiSli
         case 5:
           data = _context2.sent;
           returnedData = data !== null && data !== void 0 && data.result ? data === null || data === void 0 ? void 0 : (_data$result = data.result) === null || _data$result === void 0 ? void 0 : _data$result.map(function (_) {
-            var _$Patient$name$0$give, _$Patient, _$Patient$name, _$Patient$name$, _$Patient$alias, _$Patient2, _$Patient$age, _$Patient3, _$Patient$telecom$0$v, _$Patient4, _$Patient4$telecom, _$Patient4$telecom$, _$appno, _moment$unix, _$Patient$slotID$0$bl, _$Patient5, _$Patient5$slotID, _$Patient5$slotID$, _$Patient5$slotID$$bl, _$Patient$gender$, _$Patient6, _$Patient6$gender, _$id2;
+            var _$Patient$name$0$give, _$Patient, _$Patient$name, _$Patient$name$, _$Patient$alias, _$Patient2, _$Patient$age, _$Patient3, _$Patient$telecom$0$v, _$Patient4, _$Patient4$telecom, _$Patient4$telecom$, _$appno, _$Patient$slotID$0$bl, _$Patient5, _$Patient5$slotID, _$Patient5$slotID$, _$Patient5$slotID$$bl, _$Patient$gender$, _$Patient6, _$Patient6$gender, _$id2;
 
             return {
               "select": false,
@@ -31501,7 +31741,7 @@ var VIEW_PENDING_PATIENT_LIST = createAsyncThunk("getPendingRescheduleListApiSli
               "age": (_$Patient$age = _ === null || _ === void 0 ? void 0 : (_$Patient3 = _.Patient) === null || _$Patient3 === void 0 ? void 0 : _$Patient3.age) !== null && _$Patient$age !== void 0 ? _$Patient$age : '',
               "mobile no": (_$Patient$telecom$0$v = _ === null || _ === void 0 ? void 0 : (_$Patient4 = _.Patient) === null || _$Patient4 === void 0 ? void 0 : (_$Patient4$telecom = _$Patient4.telecom) === null || _$Patient4$telecom === void 0 ? void 0 : (_$Patient4$telecom$ = _$Patient4$telecom[0]) === null || _$Patient4$telecom$ === void 0 ? void 0 : _$Patient4$telecom$.value) !== null && _$Patient$telecom$0$v !== void 0 ? _$Patient$telecom$0$v : '',
               "appt ref no.": (_$appno = _ === null || _ === void 0 ? void 0 : _.appno) !== null && _$appno !== void 0 ? _$appno : '',
-              "appt date & time": _ !== null && _ !== void 0 && _.start ? (_moment$unix = moment.unix(_ === null || _ === void 0 ? void 0 : _.start)) === null || _moment$unix === void 0 ? void 0 : _moment$unix.format('DD MMM,YYYY hh:mm A') : '',
+              "appt date & time": _ !== null && _ !== void 0 && _.start ? utcTOLocal(_ === null || _ === void 0 ? void 0 : _.start, 'DD MMM,YYYY hh:mm A') : '',
               "reason": (_$Patient$slotID$0$bl = _ === null || _ === void 0 ? void 0 : (_$Patient5 = _.Patient) === null || _$Patient5 === void 0 ? void 0 : (_$Patient5$slotID = _$Patient5.slotID) === null || _$Patient5$slotID === void 0 ? void 0 : (_$Patient5$slotID$ = _$Patient5$slotID[0]) === null || _$Patient5$slotID$ === void 0 ? void 0 : (_$Patient5$slotID$$bl = _$Patient5$slotID$.blockreason) === null || _$Patient5$slotID$$bl === void 0 ? void 0 : _$Patient5$slotID$$bl.display) !== null && _$Patient$slotID$0$bl !== void 0 ? _$Patient$slotID$0$bl : '',
               "gender": (_$Patient$gender$ = _ === null || _ === void 0 ? void 0 : (_$Patient6 = _.Patient) === null || _$Patient6 === void 0 ? void 0 : (_$Patient6$gender = _$Patient6.gender) === null || _$Patient6$gender === void 0 ? void 0 : _$Patient6$gender[0]) !== null && _$Patient$gender$ !== void 0 ? _$Patient$gender$ : '',
               "appointmentId": (_$id2 = _ === null || _ === void 0 ? void 0 : _.id) !== null && _$id2 !== void 0 ? _$id2 : ''
@@ -31553,10 +31793,10 @@ var GET_PRACTITIONER_AGAINST_SPECIALITY = createAsyncThunk("getPendingReschedule
         case 5:
           data = _context3.sent;
           returnedData = data !== null && data !== void 0 && (_data$result2 = data.result) !== null && _data$result2 !== void 0 && (_data$result2$ = _data$result2[0]) !== null && _data$result2$ !== void 0 && _data$result2$.Practitioner ? data === null || data === void 0 ? void 0 : (_data$result3 = data.result) === null || _data$result3 === void 0 ? void 0 : (_data$result3$ = _data$result3[0]) === null || _data$result3$ === void 0 ? void 0 : (_data$result3$$Practi = _data$result3$.Practitioner) === null || _data$result3$$Practi === void 0 ? void 0 : _data$result3$$Practi.map(function (_) {
-            var _$name$0$text2, _$name2, _$name2$, _$practitioner_role$c, _$practitioner_role, _$practitioner_role$c2, _$practitioner_role$c3, _$id3, _$practitioner_role$S, _$practitioner_role2, _$practitioner_role2$;
+            var _$name2, _$practitioner_role$c, _$practitioner_role, _$practitioner_role$c2, _$practitioner_role$c3, _$id3, _$practitioner_role$S, _$practitioner_role2, _$practitioner_role2$;
 
             return {
-              label: (_$name$0$text2 = _ === null || _ === void 0 ? void 0 : (_$name2 = _.name) === null || _$name2 === void 0 ? void 0 : (_$name2$ = _$name2[0]) === null || _$name2$ === void 0 ? void 0 : _$name2$.text) !== null && _$name$0$text2 !== void 0 ? _$name$0$text2 : '',
+              label: makeName(_ === null || _ === void 0 ? void 0 : (_$name2 = _.name) === null || _$name2 === void 0 ? void 0 : _$name2[0]),
               //name
               value: (_$practitioner_role$c = _ === null || _ === void 0 ? void 0 : (_$practitioner_role = _.practitioner_role) === null || _$practitioner_role === void 0 ? void 0 : (_$practitioner_role$c2 = _$practitioner_role.coding) === null || _$practitioner_role$c2 === void 0 ? void 0 : (_$practitioner_role$c3 = _$practitioner_role$c2[0]) === null || _$practitioner_role$c3 === void 0 ? void 0 : _$practitioner_role$c3.display) !== null && _$practitioner_role$c !== void 0 ? _$practitioner_role$c : '',
               //role