diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java index 64d8d36c3..b0b8747e3 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java @@ -4826,7 +4826,7 @@ public class FHIRPathEngine { for (Base item : focus) { result.add(item); } - for (Base item : execute(context, focus, exp.getParameters().get(0), true)) { + for (Base item : execute(context, baseToList(context.thisItem), exp.getParameters().get(0), true)) { result.add(item); } return result; @@ -4834,7 +4834,7 @@ public class FHIRPathEngine { private List funcIntersect(ExecutionContext context, List focus, ExpressionNode exp) throws FHIRException { List result = new ArrayList(); - List other = execute(context, focus, exp.getParameters().get(0), true); + List other = execute(context, baseToList(context.thisItem), exp.getParameters().get(0), true); for (Base item : focus) { if (!doContains(result, item) && doContains(other, item)) {