honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue in FHIRPath .combine focus handling

This commit is contained in:
Grahame Grieve 2023-08-09 16:29:08 +10:00
parent 8d826aba44
commit 93868669fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

@ -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<Base> funcIntersect(ExecutionContext context, List<Base> focus, ExpressionNode exp) throws FHIRException {
List<Base> result = new ArrayList<Base>();
List<Base> other = execute(context, focus, exp.getParameters().get(0), true);
List<Base> other = execute(context, baseToList(context.thisItem), exp.getParameters().get(0), true);
for (Base item : focus) {
if (!doContains(result, item) && doContains(other, item)) {