fix: code cache fetch method

aphp · Dec 3, 2024 · d8fb2a8 · d8fb2a8
1 parent bc5834e
commit d8fb2a8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/...onents/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/mappers/buildMappers.ts b/...onents/LogicalOperator/components/CriteriaRightPanel/CriteriaForm/mappers/buildMappers.ts
@@ -63,7 +63,13 @@ const buildLabelObjectFilter = (
 
 const unbuildLabelObjectFilterValue = (values: string | null, prevValues: LabelObject[] | null) => {
   const valuesIds = values?.split(',') || []
-  const newArray = valuesIds?.map((value) => (value.includes('|*') ? { id: '*', label: '' } : { id: value, label: '' }))
+  const newArray = valuesIds?.map((value) => {
+    const valueElements = value.split('|')
+    if (valueElements.length > 1) {
+      return { id: valueElements[1], system: valueElements[0], label: '' }
+    }
+    return { id: valueElements[0], label: '' }
+  })
   if (newArray) {
     return [...(prevValues || []), ...newArray]
   }

diff --git a/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/BiologyForm.ts b/...DiagramView/components/LogicalOperator/components/CriteriaRightPanel/forms/BiologyForm.ts
@@ -82,7 +82,8 @@ export const form: () => CriteriaForm<ObservationDataType> = () => ({
           buildInfo: {
             fhirKey: ObservationParamsKeys.ANABIO_LOINC,
             buildMethodExtraArgs: [
-              { type: 'string', value: getConfig().features.observation.valueSets.biologyHierarchyAnabio.url }
+              { type: 'string', value: getConfig().features.observation.valueSets.biologyHierarchyAnabio.url },
+              { type: 'boolean', value: true }
             ]
           }
         },

diff --git a/src/utils/cohortCreation.ts b/src/utils/cohortCreation.ts
@@ -556,10 +556,16 @@ export const fetchCriteriasCodes = async (
               const codeSystem = code.system || defaultValueSet
               const valueSetCodeCache = updatedCriteriaData[codeSystem] ?? []
               if (!valueSetCodeCache.find((data) => data.id === code.id)) {
-                const fetchedCode = (await fetchValueSet(codeSystem, {
-                  code: code.id || ''
-                })) as LabelObject[]
-                valueSetCodeCache.push(...fetchedCode)
+                try {
+                  const fetchedCode = (await fetchValueSet(codeSystem, {
+                    search: code.id || '',
+                    noStar: true
+                  })) as LabelObject[]
+                  valueSetCodeCache.push(...fetchedCode)
+                } catch (e) {
+                  // fail silently
+                  console.error(`Error fetching code ${code.id} from system ${codeSystem}`, e)
+                }
               }
               updatedCriteriaData[codeSystem] = valueSetCodeCache
             }