From 674f834f8d85dd6d194aa10fb089e829e3602e5c Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 1 Jun 2024 22:57:13 +1000 Subject: [PATCH] Handle case where Contact.value has extensions instead of a string value --- .../src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java | 2 +- .../java/org/hl7/fhir/r5/renderers/ExampleScenarioRenderer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java index e65cfde9e..d06d90d43 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java @@ -1483,7 +1483,7 @@ public class DataRenderer extends Renderer implements CodeResolver { x.addText(displayContactPoint(contact)); break; case PHONE: - if (contact.hasValue() && contact.getValue().startsWith("+")) { + if (contact.hasPrimitiveValue() && contact.getValue().startsWith("+")) { x.ah("tel:"+contact.getValue().replace(" ", "")).tx(contact.getValue()); } else { x.addText(displayContactPoint(contact)); diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ExampleScenarioRenderer.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ExampleScenarioRenderer.java index 43ed0df1b..ed3439d5a 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ExampleScenarioRenderer.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/ExampleScenarioRenderer.java @@ -105,7 +105,7 @@ public class ExampleScenarioRenderer extends TerminologyRenderer { for (ExampleScenarioProcessStepComponent step: process.getStep()) { plantUml += toPlantUml(step, stepPrefix(prefix, step, stepCount), scen, actorsActive, actorKeys); if (step.getPause()) - plantUml += context.formatPhrase(RenderingContext.EX_SCEN_TIME); + plantUml += context.formatPhrase(RenderingContext.EX_SCEN_TIME)+"\n"; stepCount++; }