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

ValueSet rendering improvements

This commit is contained in:
Grahame Grieve 2024-08-13 07:02:52 +08:00
parent f4f978941d
commit d4097d3dc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ValueSetRenderer.java
View File

@ -1231,7 +1231,7 @@ public class ValueSetRenderer extends TerminologyRenderer {
ConceptSetFilterComponent f = inc.getFilter().get(i); ConceptSetFilterComponent f = inc.getFilter().get(i);
if (i > 0) { if (i > 0) {
if (i == inc.getFilter().size()-1) { if (i == inc.getFilter().size()-1) {
li.tx(" "+ context.formatPhrase(RenderingContext.VALUE_SET_AND)); li.tx(" "+ context.formatPhrase(RenderingContext.VALUE_SET_AND)+" ");
} else { } else {
li.tx(context.formatPhrase(RenderingContext.VALUE_SET_COMMA)+" "); li.tx(context.formatPhrase(RenderingContext.VALUE_SET_COMMA)+" ");
} }
@ -1252,15 +1252,15 @@ public class ValueSetRenderer extends TerminologyRenderer {
else else
href = href + "#"+e.getId()+"-"+Utilities.nmtokenize(f.getValue()); href = href + "#"+e.getId()+"-"+Utilities.nmtokenize(f.getValue());
wli.ah(context.prefixLocalHref(href)).addText(f.getValue()); wli.ah(context.prefixLocalHref(href)).addText(f.getValue());
} else if ("concept".equals(f.getProperty()) && inc.hasSystem()) { } else if (inc.hasSystem()) {
wli.addText(f.getValue()); wli.addText(f.getValue());
ValidationResult vr = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions(), inc.getSystem(), inc.getVersion(), f.getValue(), null); ValidationResult vr = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions(), inc.getSystem(), inc.getVersion(), f.getValue(), null);
if (vr.isOk() && vr.getDisplay() != null) { if (vr.isOk() && vr.getDisplay() != null) {
wli.tx(" ("+vr.getDisplay()+")"); wli.tx(" ("+vr.getDisplay()+")");
} }
} } else {
else
wli.addText(f.getValue()); wli.addText(f.getValue());
}
String disp = ToolingExtensions.getDisplayHint(f); String disp = ToolingExtensions.getDisplayHint(f);
if (disp != null) if (disp != null)
wli.tx(" ("+disp+")"); wli.tx(" ("+disp+")");