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

R5 FHIRPath engine fixes for polymorphism + update R4B FHIRPath engine to match R5

This commit is contained in:
Grahame Grieve 2022-10-07 08:08:04 +11:00
parent e73f79103c
commit b9036524d5
2 changed files with 424 additions and 361 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

758
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/utils/FHIRPathEngine.java
View File

File diff suppressed because it is too large Load Diff

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

@ -1798,7 +1798,18 @@ public class FHIRPathEngine {
} else if ((left.get(0) instanceof Element) && ((Element) left.get(0)).isDisallowExtensions()) {
result.add(new BooleanType(Utilities.capitalize(left.get(0).fhirType()).equals(tn) || ("System."+Utilities.capitalize(left.get(0).fhirType())).equals(tn)).noExtensions());
} else {
result.add(new BooleanType(left.get(0).hasType(tn)).noExtensions());
if (left.get(0).fhirType().equals(tn)) {
result.add(new BooleanType(true).noExtensions());
} else {
StructureDefinition sd = worker.fetchTypeDefinition(left.get(0).fhirType());
while (sd != null) {
if (tn.equals(sd.getType())) {
return makeBoolean(true);
}
sd = worker.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
}
return makeBoolean(false);
}
}
}
return result;
@ -4538,8 +4549,18 @@ public class FHIRPathEngine {
}
} else if (tn.startsWith("FHIR.")) {
if (b.hasType(tn.substring(5))) {
result.add(b);
String tnp = tn.substring(5);
if (b.fhirType().equals(tnp)) {
result.add(b);
} else {
StructureDefinition sd = worker.fetchTypeDefinition(b.fhirType());
while (sd != null) {
if (tnp.equals(sd.getType())) {
result.add(b);
break;
}
sd = worker.fetchResource(StructureDefinition.class, sd.getBaseDefinition());
}
}
}
}