Issue #1980 - don't add version to contains if CodeSystem has none

Signed-off-by: John T.E. Timm <johntimm@us.ibm.com>
LinuxForHealth · Mar 12, 2021 · dd0aea4 · dd0aea4
1 parent 22b1079
commit dd0aea4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/fhir-term/src/main/java/com/ibm/fhir/term/util/ValueSetSupport.java b/fhir-term/src/main/java/com/ibm/fhir/term/util/ValueSetSupport.java
@@ -39,6 +39,7 @@
 import com.ibm.fhir.model.type.String;
 import com.ibm.fhir.model.type.Uri;
 import com.ibm.fhir.registry.FHIRRegistry;
+import com.ibm.fhir.registry.resource.FHIRRegistryResource;
 import com.ibm.fhir.term.service.FHIRTermService;
 
 /**
@@ -279,7 +280,7 @@ private static Set<Expansion.Contains> getContains(Expansion.Contains contains)
 
     private static String getLatestVersion(Uri system) {
         java.lang.String version = FHIRRegistry.getInstance().getLatestVersion(system.getValue(), CodeSystem.class);
-        return (version != null) ? string(version) : null;
+        return (version != null && !FHIRRegistryResource.NO_VERSION.toString().equals(version)) ? string(version) : null;
     }
 
     private static boolean hasResource(java.lang.String url, Class<? extends Resource> resourceType) {