From e4d886dfec6e59a8aabd30173f3ad9b6067dabf8 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Sat, 12 Feb 2022 08:27:56 +1100 Subject: [PATCH] Fix handling of cross version extensions on choice types --- .../java/org/hl7/fhir/r5/utils/XVerExtensionManager.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java index ddf283329..5d7a69a4f 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java @@ -67,6 +67,9 @@ public class XVerExtensionManager { } JsonObject root = lists.get(v); JsonObject path = root.getAsJsonObject(e); + if (path == null) { + path = root.getAsJsonObject(e+"[x]"); + } if (path == null) { return XVerExtensionStatus.Unknown; } @@ -90,6 +93,9 @@ public class XVerExtensionManager { String e = url.substring(54); JsonObject root = lists.get(verSource); JsonObject path = root.getAsJsonObject(e); + if (path == null) { + path = root.getAsJsonObject(e+"[x]"); + } StructureDefinition sd = new StructureDefinition(); sd.setUserData(XVER_EXT_MARKER, "true");