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

Fixed rendering of actor-specific obligations, added elementIds to obligation narrative rendering

This commit is contained in:
Lloyd McKenzie 2024-05-29 12:09:00 -06:00
parent a390c9a128
commit f808aaf558
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ObligationsRenderer.java
View File

@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import org.fhir.ucum.Canonical;
import org.hl7.fhir.exceptions.DefinitionException; import org.hl7.fhir.exceptions.DefinitionException;
import org.hl7.fhir.exceptions.FHIRFormatError; import org.hl7.fhir.exceptions.FHIRFormatError;
import org.hl7.fhir.r5.conformance.profile.BindingResolution; import org.hl7.fhir.r5.conformance.profile.BindingResolution;
@ -146,7 +147,11 @@ public class ObligationsRenderer {
} }
public boolean hasActor(String id) { public boolean hasActor(String id) {
return actors.contains(new CanonicalType(id)); for (CanonicalType actor: actors) {
if (actor.getValue().equals(id))
return true;
}
return false;
} }
} }
@ -319,9 +324,20 @@ public class ObligationsRenderer {
private void renderObligationLI(XhtmlNodeList children, ObligationDetail ob) throws IOException { private void renderObligationLI(XhtmlNodeList children, ObligationDetail ob) throws IOException {
renderCodes(children, ob.getCodeList()); renderCodes(children, ob.getCodeList());
if (ob.hasFilter() || ob.hasUsage()) { if (ob.hasFilter() || ob.hasUsage() || !ob.elementIds.isEmpty()) {
children.tx(" ("); children.tx(" (");
boolean ffirst = !ob.hasFilter(); boolean ffirst = !ob.hasFilter();
boolean firstEid = true;
for (String eid: ob.elementIds) {
if (firstEid) {
children.span().i().tx("Elements: ");
firstEid = false;
} else
children.tx(", ");
String trimmedElement = eid.substring(eid.indexOf(".")+ 1);
children.tx(trimmedElement);
}
if (ob.hasFilter()) { if (ob.hasFilter()) {
children.span(null, ob.getFilterDesc()).code().tx(ob.getFilter()); children.span(null, ob.getFilterDesc()).code().tx(ob.getFilter());
} }