Merge branch 'master' into 354-generic-resource-list

beda-software · Dec 17, 2024 · 2d33024 · 2d33024
2 parents 1af194a + 459dba9
commit 2d33024
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/components/BaseQuestionnaireResponseForm/widgets/reference.tsx b/src/components/BaseQuestionnaireResponseForm/widgets/reference.tsx
@@ -110,7 +110,13 @@ export function useAnswerReference<R extends Resource = any, IR extends Resource
             return overrideGetDisplay;
         }
 
-        return (resource: R) => evaluate(resource, choiceColumn![0]!.path!, context)[0];
+        return (resource: R, includedResources: ResourcesMap<R|IR>) => evaluate(
+            resource, choiceColumn![0]!.path!,
+            {
+                ...context,
+                ...includedResources,
+                resource,
+            })[0];
     }, [choiceColumn, context, overrideGetDisplay]);
 
     // TODO: add support for fhirpath and application/x-fhir-query