honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-09 22:34:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improvements to Identifier rendering

Browse Source
This commit is contained in:
Grahame Grieve 2024-01-30 19:04:34 +11:00
parent e8f4bde1eb
commit d01cc9d1d9
1 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -1212,8 +1212,8 @@ public class DataRenderer extends Renderer implements CodeResolver {
s = ii.getType().getCoding().get(0).getDisplay()+": "+s; s = ii.getType().getCoding().get(0).getDisplay()+": "+s;
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode()) else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode())
s = lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode())+": "+s; s = lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode())+": "+s;
} else { } else if (ii.hasSystem()) {
s = "id:\u00A0"+s; s = ii.getSystem()+"#"+s;
} }
if (ii.hasUse() || ii.hasPeriod()) { if (ii.hasUse() || ii.hasPeriod()) {
@ -1234,24 +1234,32 @@ public class DataRenderer extends Renderer implements CodeResolver {
protected void renderIdentifier(XhtmlNode x, Identifier ii) { protected void renderIdentifier(XhtmlNode x, Identifier ii) {
if (ii.hasType()) { if (ii.hasType()) {
if (ii.getType().hasText()) if (ii.getType().hasText()) {
x.tx(ii.getType().getText()+":"); x.tx(ii.getType().getText());
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasDisplay()) } else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasDisplay()) {
x.tx(ii.getType().getCoding().get(0).getDisplay()+":"); x.tx(ii.getType().getCoding().get(0).getDisplay());
else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode()) } else if (ii.getType().hasCoding() && ii.getType().getCoding().get(0).hasCode()) {
x.tx(lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode())+":"); x.tx(lookupCode(ii.getType().getCoding().get(0).getSystem(), ii.getType().getCoding().get(0).getVersion(), ii.getType().getCoding().get(0).getCode()));
} else {
x.tx("id:");
}
x.nbsp();
NamingSystem ns = context.getContext().getNSUrlMap().get(ii.getSystem());
if (ns != null) {
if (ns.hasWebPath()) {
x.ah(ns.getWebPath()).tx("#");
} else {
x.tx(ns.present()+"#");
} }
x.tx("/");
} else if (ii.hasSystem()) {
NamingSystem ns = context.getContext().getNSUrlMap().get(ii.getSystem());
if (ns != null) {
if (ns.hasWebPath()) {
x.ah(ns.getWebPath(), ns.getDescription()).tx(ns.present());
} else {
x.tx(ns.present());
}
} else {
switch (ii.getSystem()) {
case "urn:oid:2.51.1.3":
x.ah("https://www.gs1.org/standards/id-keys/gln", "Global Location Number").tx("GLN");
break;
default:
x.code(ii.getSystem());
}
}
x.tx("/");
} }
x.tx(Utilities.noString(ii.getValue()) ? "?ngen-9?" : ii.getValue()); x.tx(Utilities.noString(ii.getValue()) ? "?ngen-9?" : ii.getValue());