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 bug rendering by profile

This commit is contained in:
Grahame Grieve 2020-05-29 17:44:36 +10:00
parent c4185492a5
commit 112b09d00d
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ProfileDrivenRenderer.java
View File

@ -213,6 +213,7 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
boolean firstElement = true; boolean firstElement = true;
boolean last = false; boolean last = false;
for (PropertyWrapper p : res.children()) { for (PropertyWrapper p : res.children()) {
if (!ignoreProperty(p)) {
ElementDefinition child = getElementDefinition(profile.getSnapshot().getElement(), path+"."+p.getName(), p); ElementDefinition child = getElementDefinition(profile.getSnapshot().getElement(), path+"."+p.getName(), p);
if (p.getValues().size() > 0 && p.getValues().get(0) != null && child != null && isPrimitive(child) && includeInSummary(child)) { if (p.getValues().size() > 0 && p.getValues().get(0) != null && child != null && isPrimitive(child) && includeInSummary(child)) {
if (firstElement) if (firstElement)
@ -232,8 +233,13 @@ public class ProfileDrivenRenderer extends ResourceRenderer {
} }
} }
} }
}
private boolean ignoreProperty(PropertyWrapper p) {
return Utilities.existsInList(p.getName(), "contained");
}
private boolean includeInSummary(ElementDefinition child) { private boolean includeInSummary(ElementDefinition child) {
if (child.getIsModifier()) if (child.getIsModifier())
return true; return true;