#267 upgrade core to 6.3.24

ahdis · Sep 9, 2024 · 897ed25 · 897ed25
1 parent 800d606
commit 897ed25
Show file tree

Hide file tree

Showing 11 changed files with 414 additions and 374 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,7 +2,7 @@
 
 - initial support for FML transforms between different FHIR versions (R4, R4B, R5) [#265](https://github.com/ahdis/matchbox/issues/265), set flag xVersion
 - support for FHIR R4B in engine and server [#65](https://github.com/ahdis/matchbox/issues/65)
-- upgrade to hapi-fhir 7.4.0 and org.hl7.fhir.core 6.3.20 [#267](https://github.com/ahdis/matchbox/issues/267)
+- upgrade to hapi-fhir 7.4.0 and org.hl7.fhir.core 6.3.24 [#267](https://github.com/ahdis/matchbox/issues/267)
 - Ignore info/warnings also in slicing info [#269](https://github.com/ahdis/matchbox/issues/269)
 
 2024/08/13 Release 3.8.10

diff --git a/matchbox-engine/pom.xml b/matchbox-engine/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>matchbox</artifactId>
         <groupId>health.matchbox</groupId>
-        <version>3.8.10</version>
+        <version>3.9.0</version>
     </parent>
 
     <artifactId>matchbox-engine</artifactId>

diff --git a/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java b/matchbox-engine/src/main/java/org/hl7/fhir/r5/context/BaseWorkerContext.java
@@ -941,10 +941,14 @@ public ValueSetExpansionOutcome expandVS(ValueSet vs, boolean cacheOk, boolean h
       throw new Error(formatMessage(I18nConstants.NO_VALUE_SET_IN_URL));
     }
     for (ConceptSetComponent inc : vs.getCompose().getInclude()) {
-      codeSystemsUsed.add(inc.getSystem());
+      if (inc.hasSystem()) {
+        codeSystemsUsed.add(inc.getSystem());
+      }
     }
     for (ConceptSetComponent inc : vs.getCompose().getExclude()) {
-      codeSystemsUsed.add(inc.getSystem());
+      if (inc.hasSystem()) {
+        codeSystemsUsed.add(inc.getSystem());
+      }
     }
 
     CacheToken cacheToken = txCache.generateExpandToken(vs, hierarchical);

diff --git a/matchbox-engine/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java b/matchbox-engine/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
@@ -261,15 +261,16 @@ private String pathPrefix(String ns) {
       return "sdtc:";
     if (ns.equals("urn:ihe:pharm"))
       return "pharm:";
+    if (ns.equals("http://ns.electronichealth.net.au/Ci/Cda/Extensions/3.0"))
+      return "ext:";
     if (ns.equals("urn:oid:1.3.6.1.4.1.19376.1.3.2")) {
-          // MATCHBOX
-          return "lab:";
-        }
-     if (ns.equals("urn:hl7-at:v3")) {
-          // MATCHBOX
-          return "hl7at:";
-        }
-
+        // MATCHBOX
+        return "lab:";
+      }
+   if (ns.equals("urn:hl7-at:v3")) {
+        // MATCHBOX
+        return "hl7at:";
+      }
     return "?:";
   }