primary_care_admin_binder 0.1.171 → 0.1.173

package/dist/index.cjs.js

@@ -9780,7 +9780,13 @@ var query_ids = {
   "getAgeRange": "c5a0a155-4fab-4397-92a9-b89ad94fe3fc",
   "getsearchDiagonsis": "16d56d62-980e-4f0f-9b4e-cb4ee50e99e9",
   "getdiagnosisListChild": "4646f218-21bb-43b0-8900-ecfae67e3df5",
-  "diagnosisList": "07820016-0010-4c9f-b724-26018658c4b7"
+  "diagnosisList": "07820016-0010-4c9f-b724-26018658c4b7",
+  "vitalsEdit": "3f69846f-8758-498e-ab5e-a6f590dc5416",
+  "ageRanges": "e1002f54-d214-4f8d-b535-28bcc67a3926",
+  "vitalsMeasureCodesList": "2ef8a78f-086c-4ebe-a5ef-2be95c26f2fe",
+  "vitalsApplicableList": "7d5ed06f-91a4-4822-b409-9b189e49f439",
+  "vitalsApplicableEdit": "a27804ae-8f06-471a-9216-e846860e8b8a",
+  "ageCategory": "313b0701-3354-4421-8951-488f8daec57b"
 };
 
 var getAgeRangeSort = function getAgeRangeSort(sort) {
@@ -9795,34 +9801,6 @@ var getAgeRangeSort = function getAgeRangeSort(sort) {
       return "createddate";
   }
 };
-var query$c = {
-  unitUom: function unitUom() {
-    return {
-      appcode: 'primarycareng',
-      requestid: query_ids.getCodingmasterByType,
-      filter: {
-        type: 'VITALSUOM',
-        status: true,
-        code: '',
-        sortField: "display"
-      }
-    };
-  },
-  getAgeRange: function getAgeRange(page, perPage, sort, direction, search) {
-    return {
-      appcode: 'primarycareng',
-      requestid: query_ids.getAgeRange,
-      filter: {
-        sort: getAgeRangeSort(sort),
-        direction: direction !== null && direction !== void 0 ? direction : 'desc',
-        perPage: perPage !== null && perPage !== void 0 ? perPage : 10,
-        page: page !== null && page !== void 0 ? page : 0,
-        search: "%".concat(search, "%")
-      }
-    };
-  }
-};
-
 var generateJson$c = function generateJson(data) {
   var filter = {};
   if (data.editData) {
@@ -9881,6 +9859,33 @@ var generateAgeRangeStatus = function generateAgeRangeStatus(data) {
     }
   }];
 };
+var query$c = {
+  unitUom: function unitUom() {
+    return {
+      appcode: dbName,
+      requestid: query_ids.getCodingmasterByType,
+      filter: {
+        type: 'VITALSUOM',
+        status: true,
+        code: '',
+        sortField: "display"
+      }
+    };
+  },
+  getAgeRange: function getAgeRange(page, perPage, sort, direction, search) {
+    return {
+      appcode: dbName,
+      requestid: query_ids.getAgeRange,
+      filter: {
+        sort: getAgeRangeSort(sort),
+        direction: direction !== null && direction !== void 0 ? direction : 'desc',
+        perPage: perPage !== null && perPage !== void 0 ? perPage : 10,
+        page: page !== null && page !== void 0 ? page : 0,
+        search: "%".concat(search, "%")
+      }
+    };
+  }
+};
 
 var _extraReducers$A;
 var UPSERT_AGE_RANGE = createAsyncThunk("ageRangeMasterApiSlice/save_age_range", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
@@ -10066,16 +10071,12 @@ var query$b = {
   getList: function getList(page, perPage, search) {
     return {
       appcode: dbName,
-      entity: "VitalsMeasureCodes",
-      sort: "VitalsMeasureCodes.createddate",
-      limit: {
-        offset: page,
-        count: perPage
-      },
       filter: {
-        "VitalsMeasureCodes": "VitalsMeasureCodes.activestatus==true ".concat(search ? "&& UPPER(VitalsMeasureCodes.ObsValMeasCode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(VitalsMeasureCodes.ResourceType.longdesc) LIKE '%").concat(search.toUpperCase(), "%' || UPPER(VitalsMeasureCodes.ResourceRole.shortdesc) LIKE '%").concat(search.toUpperCase(), "%'") : "")
+        page: page,
+        perPage: perPage,
+        search: search ? search : ""
       },
-      return_fields: "MERGE(VitalsMeasureCodes, {TotalCount: count(FOR cnt IN VitalsMeasureCodes FILTER (LIKE(cnt.ObsValMeasCode,'%".concat(search, "%',true) || LIKE(cnt.VitalsMeasureCodes.ResourceType.longdesc,'%").concat(search, "%',true) || LIKE(cnt.VitalsMeasureCodes.ResourceRole.shortdesc,'%").concat(search, "%',true)) && cnt.activestatus==true  return cnt._key)})")
+      requestid: query_ids.vitalsMeasureCodesList
     };
   }
 };
@@ -10094,6 +10095,7 @@ var generateJson$b = function generateJson(data) {
   }, filter), {}, {
     "metadataId": metaDataId$1,
     "metadata_dbname": metaDatadbName$1,
+    "collection": "VitalsMeasureCodes",
     "entity": "VitalsMeasureCodes",
     "is_metadata": true,
     "doc": {
@@ -10111,6 +10113,10 @@ var GET_VITALS_MEASURE_CODE = createAsyncThunk("measureCodeApiSlice/age_range_li
     rejectWithValue,
     search,
     data,
+    rawList,
+    resVal,
+    firstKey,
+    innerVal,
     TableData,
     _args = arguments,
     _t;
@@ -10124,10 +10130,31 @@ var GET_VITALS_MEASURE_CODE = createAsyncThunk("measureCodeApiSlice/age_range_li
         _context.n = 2;
         return fetchData({
           body: JSON.stringify(query$b.getList(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, search ? search : ''))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context.v;
-        TableData = data.result.sort(function (a, b) {
+        rawList = [];
+        if (Array.isArray(data)) {
+          rawList = data;
+        } else if (data) {
+          rawList = [data];
+        }
+        if (rawList.length > 0 && rawList[0]) {
+          if (rawList[0].result !== undefined) {
+            resVal = rawList[0].result;
+            rawList = Array.isArray(resVal) ? resVal : [resVal];
+          } else {
+            firstKey = Object.keys(rawList[0])[0];
+            if (firstKey && firstKey === "vitalsMeasureCodesList") {
+              innerVal = rawList[0][firstKey];
+              rawList = Array.isArray(innerVal) ? innerVal : [innerVal];
+            }
+          }
+        }
+        if (Array.isArray(rawList[0])) {
+          rawList = rawList[0];
+        }
+        TableData = rawList.sort(function (a, b) {
           return (a === null || a === void 0 ? void 0 : a.createddate) - (b === null || b === void 0 ? void 0 : b.createddate);
         });
         return _context.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10197,6 +10224,7 @@ var UPDATE_MEASURE_CODE_STATUS = createAsyncThunk("ageRangeMasterApiSlice/update
         editId = payload.editId, status = payload.status;
         queriesjson = [{
           "appcode": dbName,
+          "collection": "VitalsMeasureCodes",
           "entity": "VitalsMeasureCodes",
           "filter": "VitalsMeasureCodes._id==\"".concat(editId, "\""),
           "metadataId": metaDataId$1,
@@ -10264,110 +10292,115 @@ var query$a = {
       db_name: _dbName,
       entity: "Organization",
       sort: "Organization.name",
-      filter: "Organization.OrgType==['".concat(data, "'] && Organization.activestatus==true"),
+      filter: "Organization.activestatus==true",
       return_fields: "Organization"
     };
   },
-  entityType: "{ \n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"CodeableConceptMaster\",\n                 \"sort\": \"document(CodeableConceptMaster.coding[0]).display\",\n                \"filter\": \"CodeableConceptMaster.Type=='ORGTYPE' AND CodeableConceptMaster.activestatus==true\",\n                \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n              }"),
-  gender: "{\n            \"db_name\": \"".concat(_dbName, "\",\n            \"entity\": \"CodeableConceptMaster\",\n            \"sort\": \"document(CodeableConceptMaster.coding[0]).display\",\n            \"filter\": \"CodeableConceptMaster.Type=='GENDER' AND CodeableConceptMaster.activestatus==true\",\n            \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n          }"),
+  entityType: "{ \n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"CodingMaster\",\n                 \"sort\": \"CodingMaster.display\",\n                 \"filter\": \"CodingMaster.Type=='ORGTYPE' && CodingMaster.activestatus==true\",\n                \"return_fields\": \"CodingMaster\"\n              }"),
+  gender: "{\n            \"db_name\": \"".concat(_dbName, "\",\n            \"entity\": \"CodingMaster\",\n            \"sort\": \"CodingMaster.display\",\n            \"filter\": \"CodingMaster.Type=='GENDER' && CodingMaster.activestatus==true\",\n            \"return_fields\": \"CodingMaster\"\n          }"),
   specialityCodeOrgId: function specialityCodeOrgId(data) {
     return {
-      // db_name: _dbName,
-      // entity: "HealthcareService,CodeableConceptMaster",
-      // filter: {
-      //   HealthcareService: `HealthcareService.OrgID==${data.id}`,
-      //   CodeableConceptMaster:
-      //     "CodeableConceptMaster.id IN HealthcareService.SpecialtyID AND CodeableConceptMaster.Type=='SPECIALTY'",
-      // },
-      // sort: "document(CodeableConceptMaster.coding[0]).display",
-      // return_fields:
-      //   "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})",
-
       db_name: _dbName,
       entity: "Organization",
-      filter: "Organization.id==".concat(data.id, " && Organization.activestatus==true"),
-      return_fields: " DOCUMENT(Organization.specialtyDetails[0].specialty)"
+      filter: "Organization._id=='".concat(data.id, "' && Organization.activestatus==true"),
+      return_fields: "KEEP(Organization,'_id','id','name','specialtydetails')"
     };
   },
   specialityCode: "{\n                    \"db_name\": \"".concat(_dbName, "\",\n                    \"entity\": \"HealthcareService,CodeableConceptMaster\",\n                    \"filter\":{\"CodeableConceptMaster\":\"CodeableConceptMaster.id IN HealthcareService.SpecialtyID AND CodeableConceptMaster.Type=='SPECIALTY'\"},\n                    \"return_fields\": \"MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})\"\n                  }"),
   diagnosis: "{\n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"Diagnosis\",\n                \"filter\": \"Diagnosis.activestatus==true\",\n                \"return_fields\": \"{'_id':Diagnosis._id,'icdcode':Diagnosis.icdcode,'icdname':Diagnosis.icdname,'parenticdcode':Diagnosis.parenticdcode}\"\n              }"),
-  ageRanges: "{\n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"AgeRanges\",\n                \"filter\": {\n                \"AgeRanges\":\"AgeRanges.activestatus==true \"\n                },\n                \"sort\":\"AgeRanges.agerangecode\",\n                \"return_fields\": \"{'AgeRangesDtl':AgeRanges,'AgeCategoryDtl':DOCUMENT(AgeRanges.AgeCategory)}\"\n              }"),
-  vitalcode: "{\n              \"db_name\": \"".concat(_dbName, "\",\n              \"entity\": \"VitalsCodes\",\n              \"sort\":\"VitalsCodes.vitalscode\",\n              \"filter\": \"VitalsCodes.activestatus==true and VitalsCodes.status==true\",\n              \"return_fields\": \"{'id':VitalsCodes._id,'obscode':VitalsCodes.vitalscode,'shortdesc':VitalsCodes.shortdesc,'longdesc':VitalsCodes.longdesc,'_id':VitalsCodes._id}\"\n              }"),
+  ageRanges: function ageRanges() {
+    return {
+      appcode: _dbName,
+      requestid: query_ids["ageRanges"]
+    };
+  },
+  vitalcode: "{\n              \"db_name\": \"".concat(_dbName, "\",\n              \"entity\": \"VitalsCodes\",\n              \"sort\":\"VitalsCodes.vitalscode\",\n              \"filter\": \"VitalsCodes.activestatus==true && VitalsCodes.status==true\",\n              \"return_fields\": \"KEEP(VitalsCodes,'_id','vitalscode','shortdesc','longdesc')\"\n              }"),
   ageCategory: function ageCategory(ageRangeId) {
+    var str = String(ageRangeId || "");
+    var idx = str.lastIndexOf("/");
+    var key = idx !== -1 ? str.slice(idx + 1) : str;
     return {
-      db_name: _dbName,
-      entity: "AgeRanges",
-      sort: "AgeRanges.agerangecode",
+      appcode: _dbName,
       filter: {
-        AgeRanges: "AgeRanges.activestatus==true && AgeRanges._id=='".concat(ageRangeId, "' ")
+        _id: key || ageRangeId
       },
-      return_fields: "DOCUMENT( AgeRanges.AgeCategory)"
+      requestid: query_ids.ageCategory
     };
   },
   VitalApplicableRead: function VitalApplicableRead(page, perPage, search) {
     return {
-      db_name: _dbName,
-      entity: "VitalsApplbyPatAtrrib",
-      sort: "VitalsApplbyPatAtrrib.createddate",
-      filter: "VitalsApplbyPatAtrrib.activestatus==true ".concat(search ? "&& UPPER(VitalsApplbyPatAtrrib.spltycode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(VitalsApplbyPatAtrrib.diagcode.icdname) LIKE '%").concat(search.toUpperCase(), "%'") : ""),
-      limit: {
-        offset: page,
-        count: perPage
+      appcode: _dbName,
+      filter: {
+        page: page,
+        perPage: perPage,
+        search: search ? search : ""
       },
-      return_fields: "merge(VitalsApplbyPatAtrrib,{TotalCount:COUNT(".concat(search ? "FOR cnt IN VitalsApplbyPatAtrrib filter UPPER(cnt.spltycode) LIKE '%".concat(search.toUpperCase(), "%' || UPPER(cnt.diagcode.icdname) LIKE '%").concat(search.toUpperCase(), "%' RETURN cnt._key") : "FOR cnt IN VitalsApplbyPatAtrrib RETURN cnt._key", "),organization_id:(document(VitalsApplbyPatAtrrib.organization_id)),gender:(FOR cod IN CodeableConceptMaster filter cod._id==VitalsApplbyPatAtrrib.gender RETURN MERGE(cod,{coding:(FOR d IN TO_ARRAY(cod.coding) RETURN DOCUMENT(d).display)})),spltycode:(FOR cod IN CodeableConceptMaster filter cod._id==VitalsApplbyPatAtrrib.spltycode RETURN MERGE(cod,{coding:(FOR d IN TO_ARRAY(cod.coding) RETURN DOCUMENT(d))})),diagcode:(document(VitalsApplbyPatAtrrib.diagcode)),agecategorycode:(document(VitalsApplbyPatAtrrib.agecategorycode)),agerangecode:(document(VitalsApplbyPatAtrrib.agerangecode)),orgEntityType:(document(VitalsApplbyPatAtrrib.orgEntityType))})")
+      requestid: query_ids.vitalsApplicableList
     };
   },
   editVitalApplicable: function editVitalApplicable(id) {
+    var idStr = String(id || "");
+    var idx = idStr.lastIndexOf("/");
+    var key = idx !== -1 ? idStr.slice(idx + 1) : idStr;
     return {
-      db_name: _dbName,
-      entity: "VitalsApplbyPatAtrrib",
-      filter: "VitalsApplbyPatAtrrib.activestatus==true && VitalsApplbyPatAtrrib._key=='".concat(id.split("/")[1], "'"),
-      return_fields: "merge(VitalsApplbyPatAtrrib,{organization_id:(document(VitalsApplbyPatAtrrib.organization_id)),gender:(FOR cod IN CodeableConceptMaster filter cod._id==VitalsApplbyPatAtrrib.gender RETURN MERGE(cod,{coding:(FOR d IN TO_ARRAY(cod.coding) RETURN DOCUMENT(d).display)})),spltycode:(FOR cod IN CodeableConceptMaster filter cod._id==VitalsApplbyPatAtrrib.spltycode RETURN MERGE(cod,{coding:(FOR d IN TO_ARRAY(cod.coding) RETURN DOCUMENT(d))})),diagcode:(document(VitalsApplbyPatAtrrib.diagcode)),agecategorycode:(document(VitalsApplbyPatAtrrib.agecategorycode)),agerangecode:(document(VitalsApplbyPatAtrrib.agerangecode)),orgEntityType:(document(VitalsApplbyPatAtrrib.orgEntityType))})"
+      appcode: _dbName,
+      filter: {
+        _id: key || id
+      },
+      requestid: query_ids.vitalsApplicableEdit
     };
   },
   Diagnosis: function Diagnosis(input_text) {
     return {
       db_name: _dbName,
       entity: "Diagnosis",
-      filter: "Diagnosis.activestatus==true && Diagnosis.icdname LIKE '%".concat(input_text, "%'"),
-      return_fields: "{'_id':Diagnosis._id,'icdcode':Diagnosis.icdcode,'icdname':Diagnosis.icdname,'parenticdcode':Diagnosis.parenticdcode}"
+      filter: "Diagnosis.activestatus==true AND Diagnosis.icdname LIKE '%25".concat(input_text, "%25'"),
+      return_fields: "KEEP(Diagnosis,'_id','icdcode','icdname','parenticdcode')"
     };
   }
 };
 
+var getRawId$1 = function getRawId(val) {
+  if (val === undefined || val === null) return "";
+  var str = String(val);
+  var slashIdx = str.lastIndexOf("/");
+  return slashIdx !== -1 ? str.substring(slashIdx + 1) : str;
+};
+
 //for saving/upsert Json
 var generateSaveJSON$1 = function generateSaveJSON(data) {
   var diagnosis_arr = [];
   if (data.diagnosisGroup && data.diagnosisGroup.length > 0) {
     diagnosis_arr = data.diagnosisGroup.map(function (v) {
-      return v.value;
+      return String(v.value);
     });
   }
   var filter = {};
   if (data.editData) {
     filter = {
       filter: {
-        _id: data.editData
+        _id: String(data.editData)
       }
     };
   }
   return [_objectSpread2(_objectSpread2({
     appcode: dbName,
+    collection: "VitalsApplbyPatAtrrib",
     entity: "VitalsApplbyPatAtrrib"
   }, filter), {}, {
     is_metadata: true,
     metadataId: metaDataId$1,
     metadata_dbname: metaDatadbName$1,
     doc: {
-      organization_id: data.entityName.value ? data.entityName.value : "",
-      orgEntityType: data.entityType.value ? data.entityType.value : "",
-      gender: data.gender.value ? data.gender.value : "",
-      spltycode: data.specialCode && data.specialCode.value ? data.specialCode.value : "",
+      organization_id: data.entityName.value ? String(data.entityName.value) : "",
+      orgEntityType: data.entityType.value ? String(data.entityType.value) : "",
+      gender: data.gender.value ? String(data.gender.value) : "",
+      spltycode: data.specialCode && data.specialCode.value ? String(data.specialCode.value) : "",
       diagcode: diagnosis_arr,
-      agerangecode: data.ageRange.value ? data.ageRange.value : "",
+      agerangecode: data.ageRange.value ? String(data.ageRange.value) : "",
       Observations: generateApplicability(data.applicability) ? generateApplicability(data.applicability) : [],
       id: 0,
-      agecategorycode: [data.ageCategory.value],
+      agecategorycode: [data.ageCategory.value ? String(data.ageCategory.value) : ""],
       status: data.status
     }
   })];
@@ -10377,7 +10410,7 @@ var generateSaveJSON$1 = function generateSaveJSON(data) {
 var generateApplicability = function generateApplicability(table) {
   var arr = table.map(function (v) {
     return {
-      obscode: v.code.value,
+      obscode: String(v.code.value),
       obsseq: v.sequences ? parseInt(v.sequences) : 0,
       mandatoryYN: v.mandatoryBoolean
     };
@@ -10391,17 +10424,77 @@ var generateApplicableResJson = function generateApplicableResJson(data, state)
     return (a === null || a === void 0 ? void 0 : a.createddate) - (b === null || b === void 0 ? void 0 : b.createddate);
   });
   var list = TableData.map(function (val) {
-    var _val$spltycode, _val$spltycode2, _val$spltycode3, _val$spltycode4;
+    // Look up gender from state if it is a raw ID string
+    var genderVal = "";
+    if (val.gender) {
+      if (typeof val.gender === "string") {
+        var _state$gender;
+        var genderObj = state === null || state === void 0 || (_state$gender = state.gender) === null || _state$gender === void 0 || (_state$gender = _state$gender.data) === null || _state$gender === void 0 ? void 0 : _state$gender.find(function (sys) {
+          return String(val.gender).indexOf(String(sys.value)) > -1;
+        });
+        genderVal = genderObj ? {
+          display: genderObj.label,
+          value: genderObj.value
+        } : val.gender;
+      } else if (Array.isArray(val.gender) && val.gender.length > 0) {
+        var _val$gender$;
+        genderVal = ((_val$gender$ = val.gender[0]) === null || _val$gender$ === void 0 || (_val$gender$ = _val$gender$.coding) === null || _val$gender$ === void 0 ? void 0 : _val$gender$[0]) || "";
+      } else {
+        genderVal = val.gender;
+      }
+    }
+
+    // Look up specialty from state if it is a raw ID string
+    var specialtyVal = "";
+    if (val.spltycode) {
+      if (typeof val.spltycode === "string") {
+        var _state$speciality_cod;
+        var specialtyObj = state === null || state === void 0 || (_state$speciality_cod = state.speciality_code) === null || _state$speciality_cod === void 0 || (_state$speciality_cod = _state$speciality_cod.data) === null || _state$speciality_cod === void 0 ? void 0 : _state$speciality_cod.find(function (sys) {
+          return String(val.spltycode).indexOf(String(sys.value)) > -1;
+        });
+        specialtyVal = specialtyObj ? specialtyObj.label : val.spltycode;
+      } else if (Array.isArray(val.spltycode) && val.spltycode.length > 0) {
+        var _val$spltycode$, _val$spltycode$2;
+        specialtyVal = ((_val$spltycode$ = val.spltycode[0]) === null || _val$spltycode$ === void 0 || (_val$spltycode$ = _val$spltycode$.coding) === null || _val$spltycode$ === void 0 || (_val$spltycode$ = _val$spltycode$[0]) === null || _val$spltycode$ === void 0 ? void 0 : _val$spltycode$.display) || ((_val$spltycode$2 = val.spltycode[0]) === null || _val$spltycode$2 === void 0 ? void 0 : _val$spltycode$2.display) || "";
+      } else {
+        var _val$spltycode;
+        specialtyVal = ((_val$spltycode = val.spltycode) === null || _val$spltycode === void 0 ? void 0 : _val$spltycode.display) || "";
+      }
+    }
+
+    // Look up ageRange from state if it is a raw ID string
+    var ageRangeVal = "";
+    if (val.agerangecode) {
+      if (typeof val.agerangecode === "string" || typeof val.agerangecode === "number") {
+        var _state$ageranges_code;
+        var ageRangeObj = state === null || state === void 0 || (_state$ageranges_code = state.ageranges_code) === null || _state$ageranges_code === void 0 || (_state$ageranges_code = _state$ageranges_code.data) === null || _state$ageranges_code === void 0 ? void 0 : _state$ageranges_code.find(function (sys) {
+          return String(val.agerangecode).indexOf(String(sys.value)) > -1;
+        });
+        ageRangeVal = ageRangeObj ? ageRangeObj.label : String(val.agerangecode);
+      } else {
+        var _val$agerangecode;
+        ageRangeVal = ((_val$agerangecode = val.agerangecode) === null || _val$agerangecode === void 0 ? void 0 : _val$agerangecode.agerangecode) || "";
+      }
+    }
+
+    // Look up ageCategory from state if it is a raw ID string
+    var ageCategoryVal = "";
+    if (val.agecategorycode && val.agecategorycode.length > 0) {
+      var firstCat = val.agecategorycode[0];
+      if (_typeof(firstCat) === "object") {
+        ageCategoryVal = firstCat.code || firstCat.display || "";
+      } else {
+        ageCategoryVal = String(firstCat);
+      }
+    }
     return {
       total_count: val === null || val === void 0 ? void 0 : val.TotalCount,
-      specialCode:
-      //val.spltycode.length > 0 ? val.spltycode[0].coding[0].display : "",
-      (_val$spltycode = val.spltycode) !== null && _val$spltycode !== void 0 && (_val$spltycode = _val$spltycode[0]) !== null && _val$spltycode !== void 0 && (_val$spltycode = _val$spltycode.coding) !== null && _val$spltycode !== void 0 && (_val$spltycode = _val$spltycode[0]) !== null && _val$spltycode !== void 0 && _val$spltycode.display ? (_val$spltycode2 = val.spltycode) === null || _val$spltycode2 === void 0 || (_val$spltycode2 = _val$spltycode2[0]) === null || _val$spltycode2 === void 0 || (_val$spltycode2 = _val$spltycode2.coding) === null || _val$spltycode2 === void 0 || (_val$spltycode2 = _val$spltycode2[0]) === null || _val$spltycode2 === void 0 ? void 0 : _val$spltycode2.display : val !== null && val !== void 0 && (_val$spltycode3 = val.spltycode) !== null && _val$spltycode3 !== void 0 && _val$spltycode3.display ? val === null || val === void 0 || (_val$spltycode4 = val.spltycode) === null || _val$spltycode4 === void 0 ? void 0 : _val$spltycode4.display : "",
-      diagnosisGroup: GetDiagnosis(val.diagcode),
-      gender: val.gender.length > 0 ? val.gender[0].coding[0] : "",
+      specialCode: specialtyVal,
+      diagnosisGroup: GetDiagnosis(val.diagcode, state, val.diagcodeDetails),
+      gender: genderVal,
       status: val.status,
-      ageRange: val.agerangecode.agerangecode,
-      ageCategory: val.agecategorycode[0].code,
+      ageRange: ageRangeVal,
+      ageCategory: ageCategoryVal,
       _id: val._id
     };
   });
@@ -10409,15 +10502,19 @@ var generateApplicableResJson = function generateApplicableResJson(data, state)
 };
 
 //to get Diagnosis value for array
-var GetDiagnosis = function GetDiagnosis(diag, state) {
-  // let diagnosisGroup = state.dignosis.data.filter(({ value: id1 }) =>
-  //   diag.some(({ _id: id2 }) => id2 === id1)
-  // );
+var GetDiagnosis = function GetDiagnosis(diag, state, diagDetails) {
   var obj = {};
-  diag.forEach(function (element) {
-    var DigCode = element._id;
-    obj[DigCode] = element.icdname;
-  });
+  var items = diagDetails && diagDetails.length > 0 ? diagDetails : diag;
+  if (Array.isArray(items)) {
+    items.forEach(function (element) {
+      if (element && _typeof(element) === "object") {
+        var DigCode = element._id;
+        obj[DigCode] = element.icdname || element.icdcode || "";
+      } else if (element !== undefined && element !== null) {
+        obj[element] = String(element);
+      }
+    });
+  }
   var value = Object.values(obj);
   return value.toString();
 };
@@ -10425,6 +10522,7 @@ var GetDiagnosis = function GetDiagnosis(diag, state) {
 var generateApplicableUpdateJSON = function generateApplicableUpdateJSON(editID, Status) {
   return [{
     appcode: dbName,
+    collection: "VitalsApplbyPatAtrrib",
     entity: "VitalsApplbyPatAtrrib",
     filter: {
       _id: editID
@@ -10439,43 +10537,115 @@ var generateApplicableUpdateJSON = function generateApplicableUpdateJSON(editID,
 };
 
 //for edit read JSON
-var generateApplicableReadResJson = function generateApplicableReadResJson(data, state) {
-  var list = data.map(function (v) {
-    var _v$organization_id, _v$spltycode, _v$spltycode2;
+var generateApplicableReadResJson = function generateApplicableReadResJson() {
+  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var state = arguments.length > 1 ? arguments[1] : undefined;
+  var list = (data || []).map(function (v) {
+    var _state$entity_name, _state$entity_type;
+    // organization_id is a string like "10002" in QDM response
+    var orgIdStr = _typeof(v.organization_id) === "object" && v.organization_id !== null ? v.organization_id._id || v.organization_id.id || "" : String(v.organization_id || "");
+
+    // Look up org name from the entity_name dropdown list loaded in state
+    var orgEntry = state === null || state === void 0 || (_state$entity_name = state.entity_name) === null || _state$entity_name === void 0 || (_state$entity_name = _state$entity_name.data) === null || _state$entity_name === void 0 ? void 0 : _state$entity_name.find(function (sys) {
+      return getRawId$1(sys.value) === orgIdStr || getRawId$1(sys._id) === orgIdStr;
+    });
+    var orgName = (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.label) || (orgEntry === null || orgEntry === void 0 ? void 0 : orgEntry.name) || orgIdStr;
+
+    // orgentitytype: QDM returns lowercase "orgentitytype", value is a string ID like "10010"
+    var orgTypeRaw = v.orgentitytype || v.orgEntityType || v.OrgEntityType;
+    var orgTypeId = _typeof(orgTypeRaw) === "object" && orgTypeRaw !== null ? orgTypeRaw._id || orgTypeRaw.value || "" : String(orgTypeRaw || "");
+    var entityTypeVal = orgTypeId ? (state === null || state === void 0 || (_state$entity_type = state.entity_type) === null || _state$entity_type === void 0 || (_state$entity_type = _state$entity_type.data) === null || _state$entity_type === void 0 ? void 0 : _state$entity_type.find(function (sys) {
+      return getRawId$1(sys.value) === getRawId$1(orgTypeId);
+    })) || {
+      _id: orgTypeId,
+      value: orgTypeId,
+      label: orgTypeId
+    } : null;
+
+    // specialty code
+    var specialCodeVal = null;
+    var splyRaw = v.spltycodeId || v.spltycode;
+    if (splyRaw) {
+      var firstSply = Array.isArray(splyRaw) ? splyRaw[0] : splyRaw;
+      if (_typeof(firstSply) === "object" && firstSply !== null) {
+        specialCodeVal = {
+          _id: String(firstSply._id || firstSply.value || ""),
+          value: firstSply._id || firstSply.value || "",
+          label: String(firstSply.display || firstSply.label || firstSply._id || "")
+        };
+      } else {
+        var _state$speciality_cod2, _state$speciality_cod3;
+        var foundSp = (state === null || state === void 0 || (_state$speciality_cod2 = state.speciality_code_org) === null || _state$speciality_cod2 === void 0 || (_state$speciality_cod2 = _state$speciality_cod2.data) === null || _state$speciality_cod2 === void 0 ? void 0 : _state$speciality_cod2.find(function (sys) {
+          return getRawId$1(sys.value) === getRawId$1(firstSply);
+        })) || (state === null || state === void 0 || (_state$speciality_cod3 = state.speciality_code) === null || _state$speciality_cod3 === void 0 || (_state$speciality_cod3 = _state$speciality_cod3.data) === null || _state$speciality_cod3 === void 0 ? void 0 : _state$speciality_cod3.find(function (sys) {
+          return getRawId$1(sys.value) === getRawId$1(firstSply);
+        }));
+        specialCodeVal = foundSp || (firstSply ? {
+          _id: String(v.spltycodeId || firstSply),
+          value: String(v.spltycodeId || firstSply),
+          label: String(v.spltycode || firstSply)
+        } : null);
+      }
+    }
+
+    // gender: QDM returns gender as a code (e.g. "ACS004"), genderId as the _id (e.g. "11189")
+    var genderVal = null;
+    var rawGender = v.genderId || v.gender;
+    var firstGender = Array.isArray(rawGender) ? rawGender[0] : _typeof(rawGender) === "object" ? rawGender : null;
+    var genderId = firstGender ? firstGender._id || firstGender.id || firstGender.code || firstGender.value : rawGender;
+    if (genderId) {
+      var _state$gender2;
+      var gIdStr = String(genderId).toLowerCase();
+      genderVal = (state === null || state === void 0 || (_state$gender2 = state.gender) === null || _state$gender2 === void 0 || (_state$gender2 = _state$gender2.data) === null || _state$gender2 === void 0 ? void 0 : _state$gender2.find(function (sys) {
+        return getRawId$1(sys.value).toLowerCase() === gIdStr || String(sys.code).toLowerCase() === gIdStr || String(sys.label).toLowerCase() === gIdStr;
+      })) || null;
+      // Fallback: try matching by gender code if genderId doesn't match
+      var genderCodeStr = (firstGender === null || firstGender === void 0 ? void 0 : firstGender.code) || (firstGender === null || firstGender === void 0 ? void 0 : firstGender.display) || v.gender;
+      if (!genderVal && genderCodeStr) {
+        var _state$gender3;
+        var gCodeStr = String(genderCodeStr).toLowerCase();
+        genderVal = (state === null || state === void 0 || (_state$gender3 = state.gender) === null || _state$gender3 === void 0 || (_state$gender3 = _state$gender3.data) === null || _state$gender3 === void 0 ? void 0 : _state$gender3.find(function (sys) {
+          return getRawId$1(sys.value).toLowerCase() === gCodeStr || String(sys.code).toLowerCase() === gCodeStr || String(sys.label).toLowerCase() === gCodeStr;
+        })) || null;
+      }
+      // If still not found, fallback to 'Other' option from the list
+      if (!genderVal) {
+        var _state$gender4;
+        genderVal = (state === null || state === void 0 || (_state$gender4 = state.gender) === null || _state$gender4 === void 0 || (_state$gender4 = _state$gender4.data) === null || _state$gender4 === void 0 ? void 0 : _state$gender4.find(function (sys) {
+          return String(sys.code).toLowerCase() === "other" || String(sys.label).toLowerCase() === "other";
+        })) || null;
+      }
+    }
+
+    // ageRange: QDM returns agerangecode as a code (e.g. "AGEMONTHTEST"), agerangeId as the _id (e.g. "10004")
+    var ageRangeIdRaw = v.agerangeId || v.agerangecode;
+    var ageRangeVal = null;
+    if (ageRangeIdRaw) {
+      var firstAgeRange = _typeof(ageRangeIdRaw) === "object" && ageRangeIdRaw !== null ? ageRangeIdRaw._id || ageRangeIdRaw.value || ageRangeIdRaw.id || ageRangeIdRaw.agerangecode || "" : ageRangeIdRaw;
+      var cleanAgeRangeId = getRawId$1(firstAgeRange);
+      if (cleanAgeRangeId) {
+        var _state$ageranges_code2;
+        ageRangeVal = (state === null || state === void 0 || (_state$ageranges_code2 = state.ageranges_code) === null || _state$ageranges_code2 === void 0 || (_state$ageranges_code2 = _state$ageranges_code2.data) === null || _state$ageranges_code2 === void 0 ? void 0 : _state$ageranges_code2.find(function (sys) {
+          return getRawId$1(sys.value) === cleanAgeRangeId;
+        })) || null;
+      }
+    }
     return {
       entityName: {
-        label: v.organization_id.name,
-        value: v.organization_id._id,
-        id: v === null || v === void 0 || (_v$organization_id = v.organization_id) === null || _v$organization_id === void 0 ? void 0 : _v$organization_id.id
+        _id: orgIdStr,
+        label: String(orgName || orgIdStr || ""),
+        value: orgIdStr,
+        id: orgIdStr
       },
-      entityType: v.orgEntityType ? state.entity_type.data.find(function (sys) {
-        return v.orgEntityType && v.orgEntityType._id && v.orgEntityType._id.indexOf(sys.value) > -1 ? v.orgEntityType._id.indexOf(sys.value) > -1 : null;
-      }) : null,
-      specialCode: v !== null && v !== void 0 && v.spltycode ? {
-        value: v === null || v === void 0 || (_v$spltycode = v.spltycode) === null || _v$spltycode === void 0 ? void 0 : _v$spltycode._id,
-        label: v === null || v === void 0 || (_v$spltycode2 = v.spltycode) === null || _v$spltycode2 === void 0 ? void 0 : _v$spltycode2.display
-      } : null,
-      // specialCode: state.speciality_code.data.find(({ value: id1 }) =>
-      //   v.spltycode.some(({ _id: id2 }) => id2 === id1)
-      // ),
-      gender: state.gender.data.find(function (_ref) {
-        var id1 = _ref.value;
-        return v.gender.some(function (_ref2) {
-          var id2 = _ref2._id;
-          return id2 === id1;
-        });
-      }),
-      // diagnosisGroup: state.dignosis.data.filter(({ value: id1 }) =>
-      //   v.diagcode.some(({ _id: id2 }) => id2 === id1)
-      // ),
-      diagnosisGroup: getDiagGroup(v.diagcode),
-      ageRange: v.agerangecode ? state.ageranges_code.data.find(function (sys) {
-        return v.agerangecode._id.indexOf(sys.value) > -1;
-      }) : null,
-      ageCategoryres: v.agecategorycode,
+      entityType: entityTypeVal,
+      specialCode: specialCodeVal,
+      gender: genderVal,
+      diagnosisGroup: getDiagGroup(v.diagcode || v.diagcodeDetails),
+      ageRange: ageRangeVal,
+      ageCategoryres: v.agecategorycode || [],
       status: v.status,
       editData: v._id,
-      applicability: generateApplicableTable(v.Observations, state)
+      applicability: generateApplicableTable(v.Observations || v.observations || [], state)
     };
   });
   return list;
@@ -10483,25 +10653,35 @@ var generateApplicableReadResJson = function generateApplicableReadResJson(data,
 
 //get diaggroup
 var getDiagGroup = function getDiagGroup(data) {
-  var arr = data.map(function (v) {
-    return {
-      label: v.icdname,
-      value: v._id
-    };
+  if (!data) return [];
+  var arrData = Array.isArray(data) ? data : [data];
+  return arrData.map(function (v) {
+    if (_typeof(v) === "object" && v !== null) {
+      return {
+        label: String(v.icdname || v.label || v._id || v.value || ""),
+        value: v._id || v.value || ""
+      };
+    } else {
+      return {
+        label: String(v),
+        value: String(v)
+      };
+    }
   });
-  return arr;
 };
 
 //for edit / read form table reference
 var generateApplicableTable = function generateApplicableTable(table, state) {
+  if (!table || !Array.isArray(table)) return [];
   var arr = table.map(function (v) {
+    var _state$vital_code;
     return {
-      code: state.vital_code.data.find(function (sys) {
-        return v.obscode.indexOf(sys.value) > -1;
-      }),
-      sequences: v.obsseq,
-      mandatory: v.mandatoryYN === true ? "Yes" : "No",
-      mandatoryBoolean: v.mandatoryYN
+      code: (state === null || state === void 0 || (_state$vital_code = state.vital_code) === null || _state$vital_code === void 0 || (_state$vital_code = _state$vital_code.data) === null || _state$vital_code === void 0 ? void 0 : _state$vital_code.find(function (sys) {
+        return (v === null || v === void 0 ? void 0 : v.obscode) && String(v.obscode).indexOf(String(sys.value)) > -1;
+      })) || null,
+      sequences: (v === null || v === void 0 ? void 0 : v.obsseq) || "",
+      mandatory: (v === null || v === void 0 ? void 0 : v.mandatoryYN) === true ? "Yes" : "No",
+      mandatoryBoolean: (v === null || v === void 0 ? void 0 : v.mandatoryYN) || false
     };
   });
   return arr;
@@ -10512,8 +10692,8 @@ var GET_ENTITY_NAME = createAsyncThunk("vitalApplicableApiSlice/entityName", /*#
   var payload,
     _ref2,
     rejectWithValue,
-    list,
     data,
+    resultList,
     arr,
     _args = arguments,
     _t;
@@ -10523,19 +10703,21 @@ var GET_ENTITY_NAME = createAsyncThunk("vitalApplicableApiSlice/entityName", /*#
         payload = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
         _ref2 = _args.length > 1 ? _args[1] : undefined, rejectWithValue = _ref2.rejectWithValue;
         _context.p = 1;
-        list = payload.list;
         _context.n = 2;
         return fetchData({
-          body: JSON.stringify(query$a.entityName(list))
+          body: JSON.stringify(query$a.entityName(payload))
         }, __readDocumentUrl__);
       case 2:
         data = _context.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data.result.map(function (val) {
-          arr.push(_objectSpread2({
-            value: val._id,
-            label: val.name
-          }, val));
+        resultList.forEach(function (val) {
+          if (!val) return;
+          arr.push(_objectSpread2(_objectSpread2({}, val), {}, {
+            _id: String(val._id || val.value || val.id || ""),
+            value: val._id || val.value || val.id || "",
+            label: String(val.name || val.label || val.display || val.shortdesc || val._id || "")
+          }));
         });
         return _context.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: arr
@@ -10553,6 +10735,7 @@ var GET_ENTITY_TYPE_VITALAPP = createAsyncThunk("vitalApplicableApiSlice/entityT
   var _ref4,
     rejectWithValue,
     data,
+    resultList,
     arr,
     _args2 = arguments,
     _t2;
@@ -10567,11 +10750,15 @@ var GET_ENTITY_TYPE_VITALAPP = createAsyncThunk("vitalApplicableApiSlice/entityT
         }, __readDocumentUrl__);
       case 2:
         data = _context2.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data.result.map(function (val) {
+        resultList.forEach(function (val) {
+          if (!val) return;
+          // CodingMaster returns {_id, display, ...}, fallback for CodeableConceptMaster coding array
+          var codObj = Array.isArray(val === null || val === void 0 ? void 0 : val.coding) && _typeof(val.coding[0]) === "object" ? val.coding[0] : null;
           arr.push({
-            value: val.coding[0]._id,
-            label: val.coding[0].display
+            value: (codObj === null || codObj === void 0 ? void 0 : codObj._id) || val._id || val.value || "",
+            label: String((codObj === null || codObj === void 0 ? void 0 : codObj.display) || val.display || val.shortdesc || val.name || val.label || val._id || "")
           });
         });
         return _context2.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10590,6 +10777,7 @@ var VITAL_CODE = createAsyncThunk("vitalApplicableApiSlice/vitalCode", /*#__PURE
   var _ref6,
     rejectWithValue,
     data,
+    resultList,
     arr,
     _args3 = arguments,
     _t3;
@@ -10604,12 +10792,16 @@ var VITAL_CODE = createAsyncThunk("vitalApplicableApiSlice/vitalCode", /*#__PURE
         }, __readDocumentUrl__);
       case 2:
         data = _context3.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data.result.map(function (val) {
-          arr.push({
-            value: val._id,
-            label: val.shortdesc
-          });
+        resultList.forEach(function (val) {
+          if (!val) return;
+          var idVal = String(val._id || val.value || "");
+          arr.push(_objectSpread2(_objectSpread2({}, val), {}, {
+            _id: idVal,
+            value: idVal,
+            label: String(val.shortdesc || val.longdesc || val.label || val.obscode || val.vitalscode || val._id || "")
+          }));
         });
         return _context3.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: arr
@@ -10627,6 +10819,7 @@ var GENDER = createAsyncThunk("vitalApplicableApiSlice/gender", /*#__PURE__*/_as
   var _ref8,
     rejectWithValue,
     data,
+    resultList,
     arr,
     _args4 = arguments,
     _t4;
@@ -10641,12 +10834,18 @@ var GENDER = createAsyncThunk("vitalApplicableApiSlice/gender", /*#__PURE__*/_as
         }, __readDocumentUrl__);
       case 2:
         data = _context4.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data && data.result.map(function (val) {
-          if (val.coding[0] !== null) arr.push({
-            value: val._id,
-            label: val.coding[0].display
-          });
+        resultList.forEach(function (val) {
+          if (!val) return;
+          // CodingMaster returns {_id, display, ...}, fallback for CodeableConceptMaster coding array
+          var codObj = Array.isArray(val === null || val === void 0 ? void 0 : val.coding) && _typeof(val.coding[0]) === "object" ? val.coding[0] : null;
+          var idVal = String((codObj === null || codObj === void 0 ? void 0 : codObj._id) || val._id || val.value || "");
+          arr.push(_objectSpread2(_objectSpread2({}, val), {}, {
+            _id: idVal,
+            value: idVal,
+            label: String((codObj === null || codObj === void 0 ? void 0 : codObj.display) || val.display || val.shortdesc || val.name || val.label || val._id || "")
+          }));
         });
         return _context4.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: arr
@@ -10664,6 +10863,7 @@ var SPECIALITY_CODE = createAsyncThunk("vitalApplicableApiSlice/specialityCode",
   var _ref0,
     rejectWithValue,
     data,
+    resultList,
     arr,
     _args5 = arguments,
     _t5;
@@ -10678,13 +10878,14 @@ var SPECIALITY_CODE = createAsyncThunk("vitalApplicableApiSlice/specialityCode",
         }, __readDocumentUrl__);
       case 2:
         data = _context5.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data && data.result.map(function (val) {
-          // if (val.coding[0] !== null)
+        resultList.forEach(function (val) {
+          if (!val) return;
+          var codObj = Array.isArray(val === null || val === void 0 ? void 0 : val.coding) && _typeof(val.coding[0]) === "object" ? val.coding[0] : null;
           arr.push({
-            value: val._id,
-            //label: val.coding[0].display,
-            label: val === null || val === void 0 ? void 0 : val.display
+            value: (codObj === null || codObj === void 0 ? void 0 : codObj._id) || val._id || val.value || "",
+            label: String((codObj === null || codObj === void 0 ? void 0 : codObj.display) || val.display || val.shortdesc || val.name || val.label || val._id || "")
           });
         });
         return _context5.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10703,6 +10904,7 @@ var DIAGNOSIS = createAsyncThunk("vitalApplicableApiSlice/diagnosis", /*#__PURE_
   var _ref10,
     rejectWithValue,
     data,
+    resultList,
     arr,
     _args6 = arguments,
     _t6;
@@ -10717,11 +10919,13 @@ var DIAGNOSIS = createAsyncThunk("vitalApplicableApiSlice/diagnosis", /*#__PURE_
         }, __readDocumentUrl__);
       case 2:
         data = _context6.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data.result.map(function (val) {
+        resultList.forEach(function (val) {
+          if (!val) return;
           arr.push({
-            value: val._id,
-            label: val.icdname
+            value: val._id || val.value || "",
+            label: String(val.icdname || val.icdcode || val.label || val._id || "")
           });
         });
         return _context6.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10742,6 +10946,7 @@ var DIAGNOSIS_MASTERS = createAsyncThunk("vitalApplicableApiSlice/diagnosisMaste
     rejectWithValue,
     input_text,
     data,
+    resultList,
     arr,
     _args7 = arguments,
     _t7;
@@ -10758,11 +10963,13 @@ var DIAGNOSIS_MASTERS = createAsyncThunk("vitalApplicableApiSlice/diagnosisMaste
         }, __readDocumentUrl__);
       case 2:
         data = _context7.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data.result.map(function (val) {
+        resultList.forEach(function (val) {
+          if (!val) return;
           arr.push({
-            value: val._id,
-            label: val.icdname
+            value: val._id || val.value || "",
+            label: String(val.icdname || val.icdcode || val.label || val._id || "")
           });
         });
         return _context7.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10781,6 +10988,11 @@ var AGE_RANGES_CODE = createAsyncThunk("vitalApplicableApiSlice/agerangesCode",
   var _ref14,
     rejectWithValue,
     data,
+    result,
+    _data$0$result,
+    _data$,
+    _data$result,
+    getRawId,
     arr,
     _args8 = arguments,
     _t8;
@@ -10791,15 +11003,34 @@ var AGE_RANGES_CODE = createAsyncThunk("vitalApplicableApiSlice/agerangesCode",
         _context8.p = 1;
         _context8.n = 2;
         return fetchData({
-          body: query$a.ageRanges
-        }, __readDocumentUrl__);
+          body: JSON.stringify(query$a.ageRanges())
+        }, __baseUrl__$1);
       case 2:
         data = _context8.v;
+        result = [];
+        if (Array.isArray(data)) {
+          result = (_data$0$result = (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.result) !== null && _data$0$result !== void 0 ? _data$0$result : data;
+        } else {
+          result = (_data$result = data === null || data === void 0 ? void 0 : data.result) !== null && _data$result !== void 0 ? _data$result : [];
+        }
+        getRawId = function getRawId(val) {
+          var str = String(val || "");
+          var idx = str.lastIndexOf("/");
+          return idx !== -1 ? str.slice(idx + 1) : str;
+        };
         arr = [];
-        data.result.map(function (val) {
+        result.forEach(function (val) {
+          var dtl = (val === null || val === void 0 ? void 0 : val.AgeRangesDtl) || val;
+          var rawId = dtl === null || dtl === void 0 ? void 0 : dtl._id;
+          if (!rawId) return;
+
+          // Store only the numeric portion (e.g. "10002"), not "AgeRanges/10002".
+          // This ensures the upsert payload writes the plain ID to the database.
+          var cleanId = getRawId(rawId);
           arr.push({
-            value: val.AgeRangesDtl._id,
-            label: val.AgeRangesDtl.shortdesc
+            _id: cleanId,
+            value: cleanId,
+            label: String(dtl.shortdesc || dtl.agerangecode || cleanId || "")
           });
         });
         return _context8.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -10820,6 +11051,10 @@ var AGE_RANGES_CATEGORY = createAsyncThunk("vitalApplicableApiSlice/agerangesCat
     rejectWithValue,
     ageRangeId,
     data,
+    dataResult,
+    _data$0$result2,
+    _data$2,
+    _data$result2,
     arr,
     _args9 = arguments,
     _t9;
@@ -10833,14 +11068,26 @@ var AGE_RANGES_CATEGORY = createAsyncThunk("vitalApplicableApiSlice/agerangesCat
         _context9.n = 2;
         return fetchData({
           body: JSON.stringify(query$a.ageCategory(ageRangeId))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context9.v;
+        dataResult = [];
+        if (Array.isArray(data)) {
+          dataResult = (_data$0$result2 = (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : _data$2.result) !== null && _data$0$result2 !== void 0 ? _data$0$result2 : data;
+        } else {
+          dataResult = (_data$result2 = data === null || data === void 0 ? void 0 : data.result) !== null && _data$result2 !== void 0 ? _data$result2 : [];
+        }
+        if (Array.isArray(dataResult[0])) {
+          dataResult = dataResult[0];
+        }
         arr = [];
-        data.result[0].map(function (val) {
+        dataResult.forEach(function (val) {
+          if (!val) return;
+          var idVal = String(val._id || val.value || "");
           arr.push({
-            value: val._id,
-            label: val.description,
+            _id: idVal,
+            value: idVal,
+            label: String(val.description || val.code || val._id || ""),
             minAge: val.age_minimum,
             maxAge: val.age_maximum
           });
@@ -10864,6 +11111,7 @@ var SAVE_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/savevitala
     list,
     body,
     data,
+    resVal,
     _args0 = arguments,
     _t0;
   return _regenerator().w(function (_context0) {
@@ -10880,8 +11128,9 @@ var SAVE_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/savevitala
         }, __uspsertUrl__);
       case 2:
         data = _context0.v;
-        return _context0.a(2, _objectSpread2(_objectSpread2({}, defaultState.Info), {}, {
-          data: data
+        resVal = Array.isArray(data) ? data[0] : data;
+        return _context0.a(2, _objectSpread2(_objectSpread2({}, defaultState.Save), {}, {
+          data: resVal
         }));
       case 3:
         _context0.p = 3;
@@ -10899,7 +11148,12 @@ var READ_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/vitalsappl
     getState,
     search,
     state,
+    ccState,
     data,
+    rawList,
+    resVal,
+    firstKey,
+    innerVal,
     res,
     _args1 = arguments,
     _t1;
@@ -10911,17 +11165,35 @@ var READ_VITAL_APPLICABLE = createAsyncThunk("vitalApplicableApiSlice/vitalsappl
         _context1.p = 1;
         search = payload.search;
         state = getState();
-        state.vitalsApplicableSlice; //  const diagnosis = await fetchData(
-        //    { body: query.diagnosis },
-        //    __readDocumentUrl__
-        //  );
+        ccState = state.vitalsApplicableSlice;
         _context1.n = 2;
         return fetchData({
           body: JSON.stringify(query$a.VitalApplicableRead(payload === null || payload === void 0 ? void 0 : payload.page, payload === null || payload === void 0 ? void 0 : payload.perPage, search))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context1.v;
-        res = generateApplicableResJson(data.result);
+        rawList = [];
+        if (Array.isArray(data)) {
+          rawList = data;
+        } else if (data) {
+          rawList = [data];
+        }
+        if (rawList.length > 0 && rawList[0]) {
+          if (rawList[0].result !== undefined) {
+            resVal = rawList[0].result;
+            rawList = Array.isArray(resVal) ? resVal : [resVal];
+          } else {
+            firstKey = Object.keys(rawList[0])[0];
+            if (firstKey && firstKey.startsWith("vitalsApplicable")) {
+              innerVal = rawList[0][firstKey];
+              rawList = Array.isArray(innerVal) ? innerVal : [innerVal];
+            }
+          }
+        }
+        if (Array.isArray(rawList[0])) {
+          rawList = rawList[0];
+        }
+        res = generateApplicableResJson(rawList, ccState);
         return _context1.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: res
         }));
@@ -10979,6 +11251,10 @@ var EDIT_VITAL_APPLICABLE = createAsyncThunk("vitalsApplicableSlice/editvitalApp
     state,
     ccState,
     data,
+    rawList,
+    resVal,
+    firstKey,
+    innerVal,
     res,
     _args11 = arguments,
     _t11;
@@ -10994,10 +11270,32 @@ var EDIT_VITAL_APPLICABLE = createAsyncThunk("vitalsApplicableSlice/editvitalApp
         _context11.n = 2;
         return fetchData({
           body: JSON.stringify(query$a.editVitalApplicable(id))
-        }, __readDocumentUrl__);
+        }, __baseUrl__$1);
       case 2:
         data = _context11.v;
-        res = generateApplicableReadResJson(data.result, ccState);
+        // Unwrap QDM/Postgres response (same as READ_VITAL_APPLICABLE)
+        rawList = [];
+        if (Array.isArray(data)) {
+          rawList = data;
+        } else if (data) {
+          rawList = [data];
+        }
+        if (rawList.length > 0 && rawList[0]) {
+          if (rawList[0].result !== undefined) {
+            resVal = rawList[0].result;
+            rawList = Array.isArray(resVal) ? resVal : resVal ? [resVal] : [];
+          } else {
+            firstKey = Object.keys(rawList[0])[0];
+            if (firstKey && firstKey.startsWith("vitalsApplicable")) {
+              innerVal = rawList[0][firstKey];
+              rawList = Array.isArray(innerVal) ? innerVal : innerVal ? [innerVal] : [];
+            }
+          }
+        }
+        if (Array.isArray(rawList[0])) {
+          rawList = rawList[0];
+        }
+        res = generateApplicableReadResJson(rawList, ccState);
         return _context11.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: res
         }));
@@ -11011,35 +11309,44 @@ var EDIT_VITAL_APPLICABLE = createAsyncThunk("vitalsApplicableSlice/editvitalApp
   }, _callee11, null, [[1, 3]]);
 })));
 var SPECIALITY_CODE_ORG_ID = createAsyncThunk("vitalApplicableApiSlice/specialityCodeOrgid", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12() {
-  var payload,
-    _ref26,
+  var _ref26,
     rejectWithValue,
-    orgId,
+    _query$ageRanges,
+    specialtyQuery,
     data,
+    resultList,
     arr,
     _args12 = arguments,
     _t12;
   return _regenerator().w(function (_context12) {
     while (1) switch (_context12.p = _context12.n) {
       case 0:
-        payload = _args12.length > 0 && _args12[0] !== undefined ? _args12[0] : {};
         _ref26 = _args12.length > 1 ? _args12[1] : undefined, rejectWithValue = _ref26.rejectWithValue;
         _context12.p = 1;
-        orgId = {
-          id: payload.org_id
-        };
+        // Query CodingMaster for SPECIALTY type codes (org-independent)
+        specialtyQuery = JSON.stringify({
+          db_name: ((_query$ageRanges = query$a.ageRanges()) === null || _query$ageRanges === void 0 ? void 0 : _query$ageRanges.appcode) || dbName,
+          entity: "CodingMaster",
+          sort: "CodingMaster.display",
+          filter: "CodingMaster.Type=='SPECIALTY' && CodingMaster.activestatus==true",
+          return_fields: "CodingMaster"
+        });
         _context12.n = 2;
         return fetchData({
-          body: JSON.stringify(query$a.specialityCodeOrgId(orgId))
+          body: specialtyQuery
         }, __readDocumentUrl__);
       case 2:
         data = _context12.v;
+        resultList = Array.isArray(data === null || data === void 0 ? void 0 : data.result) ? data.result : Array.isArray(data) ? data : [];
         arr = [];
-        data && data.result.map(function (val) {
-          if (val !== "null") arr.push({
-            value: val === null || val === void 0 ? void 0 : val._id,
-            label: val === null || val === void 0 ? void 0 : val.display
-          });
+        resultList.forEach(function (val) {
+          if (!val) return;
+          var idVal = String(val._id || val.value || "");
+          arr.push(_objectSpread2(_objectSpread2({}, val), {}, {
+            _id: idVal,
+            value: idVal,
+            label: String(val.display || val.shortdesc || val.name || val._id || "")
+          }));
         });
         return _context12.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: arr
@@ -11178,31 +11485,32 @@ var vitalsApplicableSlice$1 = vitalsApplicableSlice.reducer;
 var query$9 = {
   gender: "{\n        \"db_name\": \"".concat(_dbName, "\",\n        \"entity\": \"CodingMaster\",\n        \"sort\":\"CodingMaster.display\",\n        \"filter\": \"CodingMaster.Type=='GENDER' && CodingMaster.status == true && CodingMaster.activestatus == true\",\n        \"return_fields\": \"CodingMaster\"\n  }"),
   unitAllowed: "{\n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"VitalsMeasureCodes\",\n                \"sort\":\"VitalsMeasureCodes.ObsValMeasCode\",\n                \"filter\": \"VitalsMeasureCodes.activestatus==true && VitalsMeasureCodes.status==true\",\n                \"return_fields\": \"VitalsMeasureCodes\"\n                }"),
-  // referenceUnitAllowed: `{
-  //                       "db_name": "${dbName}",
-  //                       "entity": "CodeableConceptMaster",
-  //                       "sort": "document(CodeableConceptMaster.coding[0]).display",
-  //                       "filter": "CodeableConceptMaster.Type=='VITALSUOM'",
-  //                       "return_fields": "MERGE(CodeableConceptMaster,{coding:(FOR cod IN CodeableConceptMaster.coding RETURN DOCUMENT(cod))})"
-  //                  }`,
   referenceUnitAllowed: "{\n                    \"db_name\": \"".concat(_dbName, "\",\n                    \"entity\": \"CodingMaster\",\n                    \"filter\": \"CodingMaster.Type == 'VITALSUOM' && CodingMaster.status == true && CodingMaster.activestatus == true\",\n                    \"return_fields\": \"KEEP(CodingMaster,'_id','id','_key','code','display','Type','status','shortdesc','longdesc','activestatus')\",\n                    \"sort\": \"CodingMaster.display\"\n                    }"),
-  ageRanges: "{\n                \"db_name\": \"".concat(_dbName, "\",\n                \"entity\": \"AgeRanges\",\n                \"filter\": {\n                \"AgeRanges\":\"AgeRanges.activestatus==true \"\n                },\n                \"return_fields\": \"{'AgeRangesDtl':AgeRanges,'AgeCategoryDtl':DOCUMENT(AgeRanges.AgeCategory)}\"\n              }"),
+  referenceCodeableConcepts: "{\n                    \"db_name\": \"".concat(_dbName, "\",\n                    \"entity\": \"CodeableConceptMaster\",\n                    \"filter\": \"CodeableConceptMaster.Type == 'VITALSUOM' && CodeableConceptMaster.status == true && CodeableConceptMaster.activestatus == true\",\n                    \"return_fields\": \"KEEP(CodeableConceptMaster, '_id', 'coding')\"\n                    }"),
+  ageRanges: function ageRanges() {
+    return {
+      appcode: _dbName,
+      requestid: query_ids["ageRanges"]
+    };
+  },
   ageCategory: function ageCategory(ageRangeId) {
+    var str = String(ageRangeId || "");
+    var idx = str.lastIndexOf("/");
+    var key = idx !== -1 ? str.slice(idx + 1) : str;
     return {
       appcode: _dbName,
-      entity: "AgeRanges",
       filter: {
-        AgeRanges: "AgeRanges.activestatus==true && AgeRanges._id=='".concat(ageRangeId, "' ")
+        _id: key || ageRangeId
       },
-      return_fields: "DOCUMENT( AgeRanges.AgeCategory)"
+      requestid: query_ids.ageCategory
     };
   },
   category: "{\n  \"db_name\": \"".concat(_dbName, "\",\n  \"entity\": \"AgeCategory\",\n  \"filter\": \"AgeCategory.activestatus==true\",\n  \"return_fields\": \"{_id:AgeCategory._id, id:AgeCategory.id, code:AgeCategory.code, age_minimum:AgeCategory.age_minimum, age_maximum:AgeCategory.age_maximum, UOM:AgeCategory.UOM}\"\n}"),
   defaultUnit: function defaultUnit(AllowedUnit) {
     return {
-      appcode: _dbName,
+      db_name: _dbName,
       entity: "VitalsMeasureCodes",
-      filter: "VitalsMeasureCodes.activestatus==true && VitalsMeasureCodes._id IN ['".concat(AllowedUnit.join("','"), "']"),
+      filter: "VitalsMeasureCodes.activestatus==true && VitalsMeasureCodes._id IN ('".concat(AllowedUnit.join("','"), "')"),
       return_fields: "VitalsMeasureCodes"
     };
   },
@@ -11227,35 +11535,53 @@ var query$9 = {
       requestid: query_ids["VitalRead"]
     };
   },
-  deleteVitalMaster: function deleteVitalMaster(id) {
+  editVitalmaster: function editVitalmaster(_id) {
     return {
       appcode: _dbName,
-      entity: "VitalsCodes",
-      filter: "VitalsCodes._id=='".concat(id, "'")
+      filter: {
+        _id: _id
+      },
+      requestid: query_ids["vitalsEdit"]
     };
   },
-  editVitalmaster: function editVitalmaster(id) {
+  deleteVitalMaster: function deleteVitalMaster(id) {
     return {
-      db_name: _dbName,
+      appcode: _dbName,
       entity: "VitalsCodes",
-      filter: "VitalsCodes.activestatus==true && VitalsCodes._id=='".concat(id, "'"),
-      return_fields: "MERGE(VitalsCodes,{VitalsCodesReferenceRanges:(FOR cod IN VitalsCodes.VitalsCodesReferenceRanges RETURN DOCUMENT(cod))})"
+      filter: "VitalsCodes._id=='".concat(id, "'")
     };
   }
 };
 
-//category based on ageRanges
-var categoryJson = function categoryJson(data, state, agecategory) {
+var getRawId = function getRawId(val) {
+  if (val === undefined || val === null) return "";
+  var str = String(val);
+  var slashIdx = str.lastIndexOf("/");
+  return slashIdx !== -1 ? str.substring(slashIdx + 1) : str;
+};
+var mapUomToCodingMaster = function mapUomToCodingMaster(uomVal, codeableConcepts) {
+  var idStr = getRawId(uomVal);
+  var concept = (codeableConcepts || []).find(function (c) {
+    return getRawId(c === null || c === void 0 ? void 0 : c._id) === idStr;
+  });
+  if (concept && Array.isArray(concept.coding) && concept.coding.length > 0) {
+    return getRawId(concept.coding[0]);
+  }
+  return idStr;
+};
+var categoryJson = function categoryJson(data, state, agecategory, codeableConcepts) {
   var arr = data.map(function (v) {
+    var _state$reference_unit;
     return {
       category: agecategory.find(function (sys) {
-        return v._id.indexOf(sys._id) > -1;
+        return getRawId(v._id) === getRawId(sys._id);
       }),
       description: v.description,
       ageMin: v.age_minimum,
       ageMax: v.age_maximum,
-      unit: state.reference_unit_allowed.data.find(function (sys) {
-        return v.UOM.indexOf(sys.value) > -1;
+      unit: (((_state$reference_unit = state.reference_unit_allowed) === null || _state$reference_unit === void 0 ? void 0 : _state$reference_unit.data) || []).find(function (sys) {
+        var vUom = mapUomToCodingMaster(v.UOM || v.uom, codeableConcepts);
+        return getRawId(vUom) === getRawId(sys.value);
       }),
       normalMin: "",
       normalMax: "",
@@ -11282,11 +11608,11 @@ var generateJSON$1 = function generateJSON(data) {
   }
   return [_objectSpread2(_objectSpread2({
     appcode: dbName,
-    entity: "VitalsCodes"
+    collection: "VitalsCodes"
   }, filter), {}, {
     is_metadata: true,
     metadataId: metaDataId$1,
-    metadata_dbname: metaDatadbName$1,
+    metadata_appcode: metaDatadbName$1,
     doc: {
       _id: "",
       vitalscode: data.code ? data.code : "",
@@ -11295,7 +11621,7 @@ var generateJSON$1 = function generateJSON(data) {
       id: 0,
       status: data.status,
       units_allowed: unit_arr,
-      default_unit: data.defaultUnit ? data.defaultUnit.value : "",
+      default_unit: data.defaultUnit ? data.defaultUnit.value.toString() : "",
       obstype: data !== null && data !== void 0 && data.obstype ? data === null || data === void 0 || (_data$obstype = data.obstype) === null || _data$obstype === void 0 ? void 0 : _data$obstype._id : "",
       resultreport: data !== null && data !== void 0 && data.resultreport ? data === null || data === void 0 || (_data$resultreport = data.resultreport) === null || _data$resultreport === void 0 ? void 0 : _data$resultreport._id : "",
       resultcodeset: data !== null && data !== void 0 && data.resultcodeset ? data === null || data === void 0 ? void 0 : data.resultcodeset : "",
@@ -11311,24 +11637,22 @@ var generateCodeReference = function generateCodeReference(data) {
   data.map(function (val) {
     val.table.map(function (v) {
       arr.push({
-        _id: val._id ? val._id : "",
-        // obscode: "",
-        // obscomp: "",
-        gender: val.gender ? val.gender.value : "",
+        _id: v._id ? String(v._id) : "",
+        gender: val.gender ? String(val.gender.value) : "",
         meaningtype: "",
         raceappliesto: "",
-        agecategory: v.category ? v.category._id : "",
+        agecategory: v.category ? String(v.category._id) : "",
         age_minimum: v.ageMin ? parseInt(v.ageMin) : 0,
         age_maximum: v.ageMax ? parseInt(v.ageMax) : 0,
-        UOM: val.Unit ? val.Unit.value : "",
+        UOM: val.Unit ? String(val.Unit.value) : "",
         valdatatype: "",
         normal_min: v.normalMin ? parseInt(v.normalMin) : 0,
         normal_max: v.normalMax ? parseInt(v.normalMax) : 0,
-        RefValUOM: v.unit ? v.unit.value : "",
+        RefValUOM: v.unit ? String(v.unit.value) : "",
         id: 0,
         validation_min: v.validationMin ? parseInt(v.validationMin) : 0,
         validation_max: v.validationMax ? parseInt(v.validationMax) : 0,
-        agerangecode: val.ageRange ? val.ageRange.value : ""
+        agerangecode: val.ageRange ? String(val.ageRange.value) : ""
       });
     });
   });
@@ -11356,6 +11680,7 @@ var generateUpdateJSON$1 = function generateUpdateJSON(editID, Status) {
   return [{
     appcode: dbName,
     entity: "VitalsCodes",
+    collection: "vitalscodes",
     filter: {
       _id: editID
     },
@@ -11378,22 +11703,24 @@ var generateReadResJson = function generateReadResJson(data, state, ageCategory)
       shortdes: v.shortdesc,
       status: v.status,
       obstype: v.obstype ? state.getGeneralDataforVitalType.data.find(function (sys) {
-        return v.obstype.indexOf(sys.value) > -1;
+        return String(v.obstype || "").indexOf(String(sys.value)) > -1;
       }) : "",
       loadtype: v.loadtype ? state.getGeneralDataforLoadType.data.find(function (sys) {
-        return v.loadtype.indexOf(sys.value) > -1;
+        return String(v.loadtype || "").indexOf(String(sys.value)) > -1;
       }) : "",
       resultcodeset: v.resultcodeset,
       resultreport: v.resultreport ? state.getGeneralDataforControlType.data.find(function (sys) {
-        return v.resultreport.indexOf(sys.value) > -1;
+        return String(v.resultreport || "").indexOf(String(sys.value)) > -1;
       }) : "",
       unitAllowed: state.unit_allowed.data.filter(function (sys) {
-        return v.units_allowed.indexOf(sys.value) > -1;
+        var allowed = (v.units_allowed || []).map(String);
+        return allowed.indexOf(String(sys.value)) > -1;
       }),
       defaultUnit: state.unit_allowed.data.find(function (sys) {
-        return v.default_unit.indexOf(sys.value) > -1;
+        var defUnit = String(v.default_unit || "");
+        return defUnit.indexOf(String(sys.value)) > -1;
       }),
-      reference: generateReference(v.VitalsCodesReferenceRanges, state, ageCategory)
+      reference: generateReference(v.VitalsCodesReferenceRanges || v.vitalscodesreferenceranges || [], state, ageCategory)
     };
   });
   return list;
@@ -11403,17 +11730,17 @@ var generateReadResJson = function generateReadResJson(data, state, ageCategory)
 var generateReference = function generateReference(ref, state, ageCategory) {
   var obj = {};
   ref.forEach(function (element) {
-    var ageRange = element.agerangecode;
+    var ageRange = getRawId(element.agerangecode);
     if (ageRange in obj) {
       var tableObj = {
         _id: element._id,
         category: ageCategory.find(function (sys) {
-          return element.agecategory.indexOf(sys._id) > -1;
+          return getRawId(element.agecategory) === getRawId(sys._id);
         }),
         ageMin: element.age_minimum,
         ageMax: element.age_maximum,
         unit: state.reference_unit_allowed.data.find(function (sys) {
-          return element.RefValUOM.indexOf(sys.value) > -1;
+          return getRawId(element.RefValUOM) === getRawId(sys.value);
         }),
         normalMin: element.normal_min,
         normalMax: element.normal_max,
@@ -11424,28 +11751,25 @@ var generateReference = function generateReference(ref, state, ageCategory) {
     } else {
       obj[ageRange] = {
         ageRange: state.reference_ageranges.data.find(function (sys) {
-          return element.agerangecode.indexOf(sys.value) > -1;
+          return getRawId(element.agerangecode) === getRawId(sys.value);
         }),
         gender: state.master_gender.data.find(function (sys) {
-          return element.gender.indexOf(sys.value) > -1;
+          return getRawId(element.gender) === getRawId(sys.value);
         }),
-        // Unit: state.reference_unit_allowed.data.find(
-        //   (sys) => element.UOM.indexOf(sys.value) > -1
-        // ),
         Unit: state.reference_unit_allowed.data.find(function (sys) {
-          return element.UOM.indexOf(sys.value) > -1;
+          return getRawId(element.UOM) === getRawId(sys.value);
         }),
         table: []
       };
       var _tableObj = {
         _id: element._id,
         category: ageCategory.find(function (sys) {
-          return element.agecategory.indexOf(sys._id) > -1;
+          return getRawId(element.agecategory) === getRawId(sys._id);
         }),
         ageMin: element.age_minimum,
         ageMax: element.age_maximum,
         unit: state.reference_unit_allowed.data.find(function (sys) {
-          return element.RefValUOM.indexOf(sys.value) > -1;
+          return getRawId(element.RefValUOM) === getRawId(sys.value);
         }),
         normalMin: element.normal_min,
         normalMax: element.normal_max,
@@ -11555,8 +11879,8 @@ var UNIT_ALLOWED = createAsyncThunk("vitalsMasterSectionApiSlice/unitAllowed", /
         arr = [];
         data && data.result.map(function (val) {
           arr.push({
-            value: val._id,
-            label: val.ObsValMeasCode
+            value: String(val._id),
+            label: val.ObsValMeasCode || val.obsvalmeascode
           });
         });
         return _context3.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -11575,6 +11899,11 @@ var REFERENCE_AGERANGES = createAsyncThunk("vitalsMasterSectionApiSlice/agerange
   var _ref8,
     rejectWithValue,
     data,
+    result,
+    _data$0$result,
+    _data$,
+    _data$result2,
+    getRawId,
     arr,
     _args4 = arguments,
     _t4;
@@ -11585,14 +11914,31 @@ var REFERENCE_AGERANGES = createAsyncThunk("vitalsMasterSectionApiSlice/agerange
         _context4.p = 1;
         _context4.n = 2;
         return fetchData({
-          body: query$9.ageRanges
-        }, __readDocumentUrl__);
+          body: JSON.stringify(query$9.ageRanges())
+        }, __baseUrl__$1);
       case 2:
         data = _context4.v;
+        result = [];
+        if (Array.isArray(data)) {
+          result = (_data$0$result = (_data$ = data[0]) === null || _data$ === void 0 ? void 0 : _data$.result) !== null && _data$0$result !== void 0 ? _data$0$result : data; // case 2, else case 3
+        } else {
+          result = (_data$result2 = data === null || data === void 0 ? void 0 : data.result) !== null && _data$result2 !== void 0 ? _data$result2 : []; // case 1
+        }
+        getRawId = function getRawId(val) {
+          var str = String(val || "");
+          var idx = str.lastIndexOf("/");
+          return idx !== -1 ? str.slice(idx + 1) : str;
+        };
         arr = [];
-        data.result.map(function (val) {
+        result.forEach(function (val) {
+          var _val$AgeRangesDtl;
+          var rawId = val === null || val === void 0 || (_val$AgeRangesDtl = val.AgeRangesDtl) === null || _val$AgeRangesDtl === void 0 ? void 0 : _val$AgeRangesDtl._id;
+          if (!rawId) return;
+
+          // Store only the numeric portion (e.g. "10002"), not "AgeRanges/10002".
+          // This ensures the upsert payload writes the plain ID to the database.
           arr.push({
-            value: val.AgeRangesDtl._id,
+            value: getRawId(rawId),
             label: val.AgeRangesDtl.agerangecode
           });
         });
@@ -11617,7 +11963,20 @@ var REFERENCE_AGERANGES_CATEGORY = createAsyncThunk("vitalsMasterSectionApiSlice
     state,
     ccState,
     category,
-    data,
+    codeableConcepts,
+    data,
+    categoryResult,
+    _category$0$result,
+    _category$,
+    _category$result,
+    codeableConceptResult,
+    _codeableConcepts$0$r,
+    _codeableConcepts$,
+    _codeableConcepts$res,
+    dataResult,
+    _data$0$result2,
+    _data$2,
+    _data$result3,
     res,
     _args5 = arguments,
     _t5;
@@ -11638,22 +11997,56 @@ var REFERENCE_AGERANGES_CATEGORY = createAsyncThunk("vitalsMasterSectionApiSlice
         category = _context5.v;
         _context5.n = 3;
         return fetchData({
-          body: JSON.stringify(query$9.ageCategory(ageRangeId))
+          body: query$9.referenceCodeableConcepts
         }, __readDocumentUrl__);
       case 3:
+        codeableConcepts = _context5.v;
+        _context5.n = 4;
+        return fetchData({
+          body: JSON.stringify(query$9.ageCategory(ageRangeId))
+        }, __baseUrl__$1);
+      case 4:
         data = _context5.v;
-        res = categoryJson(data.result[0], ccState, category.result);
+        categoryResult = [];
+        if (Array.isArray(category)) {
+          categoryResult = (_category$0$result = (_category$ = category[0]) === null || _category$ === void 0 ? void 0 : _category$.result) !== null && _category$0$result !== void 0 ? _category$0$result : category;
+        } else {
+          categoryResult = (_category$result = category === null || category === void 0 ? void 0 : category.result) !== null && _category$result !== void 0 ? _category$result : [];
+        }
+        if (Array.isArray(categoryResult[0])) {
+          categoryResult = categoryResult[0];
+        }
+        codeableConceptResult = [];
+        if (Array.isArray(codeableConcepts)) {
+          codeableConceptResult = (_codeableConcepts$0$r = (_codeableConcepts$ = codeableConcepts[0]) === null || _codeableConcepts$ === void 0 ? void 0 : _codeableConcepts$.result) !== null && _codeableConcepts$0$r !== void 0 ? _codeableConcepts$0$r : codeableConcepts;
+        } else {
+          codeableConceptResult = (_codeableConcepts$res = codeableConcepts === null || codeableConcepts === void 0 ? void 0 : codeableConcepts.result) !== null && _codeableConcepts$res !== void 0 ? _codeableConcepts$res : [];
+        }
+        if (Array.isArray(codeableConceptResult[0])) {
+          codeableConceptResult = codeableConceptResult[0];
+        }
+        dataResult = [];
+        if (Array.isArray(data)) {
+          dataResult = (_data$0$result2 = (_data$2 = data[0]) === null || _data$2 === void 0 ? void 0 : _data$2.result) !== null && _data$0$result2 !== void 0 ? _data$0$result2 : data;
+        } else {
+          dataResult = (_data$result3 = data === null || data === void 0 ? void 0 : data.result) !== null && _data$result3 !== void 0 ? _data$result3 : [];
+        }
+        // nested-array shape [[{...}]] is handled below
+        if (Array.isArray(dataResult[0])) {
+          dataResult = dataResult[0];
+        }
+        res = categoryJson(dataResult, ccState, categoryResult, codeableConceptResult);
         return _context5.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
           data: res
         }));
-      case 4:
-        _context5.p = 4;
+      case 5:
+        _context5.p = 5;
         _t5 = _context5.v;
         return _context5.a(2, rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
           message: _t5.message
         })));
     }
-  }, _callee5, null, [[1, 4]]);
+  }, _callee5, null, [[1, 5]]);
 })));
 var DEFAULT_UNIT = createAsyncThunk("vitalsMasterSectionApiSlice/defaultunit", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
   var payload,
@@ -11680,8 +12073,8 @@ var DEFAULT_UNIT = createAsyncThunk("vitalsMasterSectionApiSlice/defaultunit", /
         arr = [];
         data && data.result.map(function (val) {
           arr.push({
-            value: val._id,
-            label: val.ObsValMeasCode
+            value: String(val._id),
+            label: val.ObsValMeasCode || val.obsvalmeascode
           });
         });
         return _context6.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
@@ -11837,58 +12230,84 @@ var DELETE_VITAL_MASTER = createAsyncThunk("vitalsMasterSectionApiSlice/vitalMas
     }
   }, _callee0, null, [[1, 3]]);
 })));
-var EDIT_VITAL_MASTER = createAsyncThunk("vitalsMasterSectionApiSlice/editvitalMaster", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
-  var payload,
-    _ref20,
-    rejectWithValue,
-    getState,
-    id,
-    state,
-    ccState,
-    category,
-    data,
-    res,
-    _args1 = arguments,
-    _t1;
-  return _regenerator().w(function (_context1) {
-    while (1) switch (_context1.p = _context1.n) {
-      case 0:
-        payload = _args1.length > 0 && _args1[0] !== undefined ? _args1[0] : {};
-        _ref20 = _args1.length > 1 ? _args1[1] : undefined, rejectWithValue = _ref20.rejectWithValue, getState = _ref20.getState;
-        _context1.p = 1;
-        id = payload.id;
-        state = getState();
-        ccState = state.vitalsMasterSectionSlice;
-        _context1.n = 2;
-        return fetchData({
-          body: query$9.category
-        }, __readDocumentUrl__);
-      case 2:
-        category = _context1.v;
-        _context1.n = 3;
-        return fetchData({
-          body: JSON.stringify(query$9.editVitalmaster(id))
-        }, __readDocumentUrl__);
-      case 3:
-        data = _context1.v;
-        res = generateReadResJson(data.result, ccState, category.result);
-        return _context1.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
-          data: res
-        }));
-      case 4:
-        _context1.p = 4;
-        _t1 = _context1.v;
-        return _context1.a(2, rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
-          message: _t1.message
-        })));
-    }
-  }, _callee1, null, [[1, 4]]);
-})));
+var EDIT_VITAL_MASTER = createAsyncThunk("vitalsMasterSectionApiSlice/editvitalMaster", /*#__PURE__*/function () {
+  var _ref20 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(payload, _ref19) {
+    var rejectWithValue, getState, body, data, state, ccState, category, categoryResult, _category$0$result2, _category$2, _category$result2, rawList, resVal, firstKey, innerVal, res, _t1;
+    return _regenerator().w(function (_context1) {
+      while (1) switch (_context1.p = _context1.n) {
+        case 0:
+          rejectWithValue = _ref19.rejectWithValue, getState = _ref19.getState;
+          _context1.p = 1;
+          body = JSON.stringify({
+            appcode: dbName,
+            filter: {
+              _id: payload === null || payload === void 0 ? void 0 : payload.id
+            },
+            requestid: query_ids.vitalsEdit
+          });
+          _context1.n = 2;
+          return fetchData({
+            body: body
+          }, __baseUrl__$1);
+        case 2:
+          data = _context1.v;
+          state = getState();
+          ccState = state.vitalsMasterSectionSlice;
+          _context1.n = 3;
+          return fetchData({
+            body: query$9.category
+          }, __readDocumentUrl__);
+        case 3:
+          category = _context1.v;
+          categoryResult = [];
+          if (Array.isArray(category)) {
+            categoryResult = (_category$0$result2 = (_category$2 = category[0]) === null || _category$2 === void 0 ? void 0 : _category$2.result) !== null && _category$0$result2 !== void 0 ? _category$0$result2 : category;
+          } else {
+            categoryResult = (_category$result2 = category === null || category === void 0 ? void 0 : category.result) !== null && _category$result2 !== void 0 ? _category$result2 : [];
+          }
+          if (Array.isArray(categoryResult[0])) {
+            categoryResult = categoryResult[0];
+          }
+          rawList = [];
+          if (Array.isArray(data)) {
+            rawList = data;
+          } else if (data) {
+            rawList = [data];
+          }
+          if (rawList.length > 0 && rawList[0]) {
+            if (rawList[0].result !== undefined) {
+              resVal = rawList[0].result;
+              rawList = Array.isArray(resVal) ? resVal : [resVal];
+            } else {
+              firstKey = Object.keys(rawList[0])[0];
+              if (firstKey && firstKey === "vitalsEdit") {
+                innerVal = rawList[0][firstKey];
+                rawList = Array.isArray(innerVal) ? innerVal : [innerVal];
+              }
+            }
+          }
+          res = generateReadResJson(rawList, ccState, categoryResult);
+          return _context1.a(2, _objectSpread2(_objectSpread2({}, defaultState.List), {}, {
+            data: res
+          }));
+        case 4:
+          _context1.p = 4;
+          _t1 = _context1.v;
+          return _context1.a(2, rejectWithValue(_objectSpread2(_objectSpread2({}, defaultReject), {}, {
+            message: _t1.message
+          })));
+      }
+    }, _callee1, null, [[1, 4]]);
+  }));
+  return function (_x, _x2) {
+    return _ref20.apply(this, arguments);
+  };
+}());
 var GET_GENERAL_DATA_VITAL_TYPE = createAsyncThunk("vitalsMasterSectionApiSlice/getGeneralDataforVitalType", /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
   var payload,
     _ref22,
     rejectWithValue,
-    _data$,
+    _data$3,
     body,
     data,
     arry,
@@ -11918,7 +12337,7 @@ var GET_GENERAL_DATA_VITAL_TYPE = createAsyncThunk("vitalsMasterSectionApiSlice/
       case 2:
         data = _context10.v;
         arry = [];
-        (_data$ = data[0]) === null || _data$ === void 0 || (_data$ = _data$.OBSERVATIONTYPE) === null || _data$ === void 0 || (_data$ = _data$.Value) === null || _data$ === void 0 || _data$.map(function (item) {
+        (_data$3 = data[0]) === null || _data$3 === void 0 || (_data$3 = _data$3.OBSERVATIONTYPE) === null || _data$3 === void 0 || (_data$3 = _data$3.Value) === null || _data$3 === void 0 || _data$3.map(function (item) {
           return arry.push({
             _id: item._id,
             value: item._id,
@@ -11941,7 +12360,7 @@ var GET_GENERAL_DATA_LOAD_TYPE = createAsyncThunk("vitalsMasterSectionApiSlice/g
   var payload,
     _ref24,
     rejectWithValue,
-    _data$2,
+    _data$4,
     body,
     data,
     arry,
@@ -11971,7 +12390,7 @@ var GET_GENERAL_DATA_LOAD_TYPE = createAsyncThunk("vitalsMasterSectionApiSlice/g
       case 2:
         data = _context11.v;
         arry = [];
-        (_data$2 = data[0]) === null || _data$2 === void 0 || (_data$2 = _data$2.RULEQUERYORGM) === null || _data$2 === void 0 || (_data$2 = _data$2.Value) === null || _data$2 === void 0 || _data$2.map(function (item) {
+        (_data$4 = data[0]) === null || _data$4 === void 0 || (_data$4 = _data$4.RULEQUERYORGM) === null || _data$4 === void 0 || (_data$4 = _data$4.Value) === null || _data$4 === void 0 || _data$4.map(function (item) {
           return arry.push({
             _id: item._id,
             value: item._id,
@@ -11994,7 +12413,7 @@ var GET_GENERAL_DATA_CONTROL_TYPE = createAsyncThunk("vitalsMasterSectionApiSlic
   var payload,
     _ref26,
     rejectWithValue,
-    _data$3,
+    _data$5,
     body,
     data,
     arry,
@@ -12024,7 +12443,7 @@ var GET_GENERAL_DATA_CONTROL_TYPE = createAsyncThunk("vitalsMasterSectionApiSlic
       case 2:
         data = _context12.v;
         arry = [];
-        (_data$3 = data[0]) === null || _data$3 === void 0 || (_data$3 = _data$3.RESULTREPORTDATATYPE) === null || _data$3 === void 0 || (_data$3 = _data$3.Value) === null || _data$3 === void 0 || _data$3.map(function (item) {
+        (_data$5 = data[0]) === null || _data$5 === void 0 || (_data$5 = _data$5.RESULTREPORTDATATYPE) === null || _data$5 === void 0 || (_data$5 = _data$5.Value) === null || _data$5 === void 0 || _data$5.map(function (item) {
           return arry.push({
             _id: item._id,
             value: item._id,