From 16e826fd0568c61595028026a19234a9e17e193b Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sun, 8 Dec 2024 18:06:24 +0300 Subject: [PATCH] fix bug using wrong reference on uri in liquid renderer --- .../java/org/hl7/fhir/r5/renderers/ResourceRenderer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java index f38131309..937f39bf0 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ResourceRenderer.java @@ -26,7 +26,6 @@ import org.hl7.fhir.r5.model.Reference; import org.hl7.fhir.r5.model.Resource; import org.hl7.fhir.r5.model.StructureDefinition; import org.hl7.fhir.r5.model.UriType; -import org.hl7.fhir.r5.renderers.Renderer.RenderingStatus; import org.hl7.fhir.r5.renderers.utils.RenderingContext; import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceReferenceKind; import org.hl7.fhir.r5.renderers.utils.Resolver.ResourceWithReference; @@ -603,6 +602,10 @@ public abstract class ResourceRenderer extends DataRenderer { if (v.startsWith("mailto:")) { x.ah(v).addText(v.substring(7)); } else { + String link = getLinkForCode(v, null, null); + if (link != null) { + x.ah(context.prefixLocalHref(link)).addText(v); + } else { ResourceWithReference rr = local ? resolveReference(uri.resource(), v, true) : resolveReference(uri); if (rr != null) { if (rr.getResource() == null) { @@ -628,6 +631,7 @@ public abstract class ResourceRenderer extends DataRenderer { } } } + } } }