Add check to naiveExpand for existence of compose codes

cqframework · Oct 10, 2024 · 04f1b62 · 04f1b62
1 parent f236c13
commit 04f1b62
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/...hir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/dstu3/ValueSetAdapter.java b/...hir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/dstu3/ValueSetAdapter.java
@@ -150,16 +150,18 @@ public ValueSet.ValueSetExpansionParameterComponent createNaiveParameter() {
 
     @Override
     public void naiveExpand() {
-        var expansion = newExpansion().addParameter(createNaiveParameter());
-
-        for (var code : getCodesInCompose(fhirContext, getValueSet())) {
-            expansion
-                    .addContains()
-                    .setCode(code.getCode())
-                    .setSystem(code.getSystem())
-                    .setVersion(code.getVersion())
-                    .setDisplay(code.getDisplay());
+        var codes = getCodesInCompose(fhirContext, getValueSet());
+        if (codes != null && !codes.isEmpty()) {
+            var expansion = newExpansion().addParameter(createNaiveParameter());
+            for (var code : codes) {
+                expansion
+                        .addContains()
+                        .setCode(code.getCode())
+                        .setSystem(code.getSystem())
+                        .setVersion(code.getVersion())
+                        .setDisplay(code.getDisplay());
+            }
+            getValueSet().setExpansion(expansion);
         }
-        getValueSet().setExpansion(expansion);
     }
 }
diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/r4/ValueSetAdapter.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/r4/ValueSetAdapter.java
@@ -151,16 +151,18 @@ public ValueSet.ValueSetExpansionParameterComponent createNaiveParameter() {
 
     @Override
     public void naiveExpand() {
-        var expansion = newExpansion().addParameter(createNaiveParameter());
-
-        for (var code : getCodesInCompose(fhirContext, getValueSet())) {
-            expansion
-                    .addContains()
-                    .setCode(code.getCode())
-                    .setSystem(code.getSystem())
-                    .setVersion(code.getVersion())
-                    .setDisplay(code.getDisplay());
+        var codes = getCodesInCompose(fhirContext, getValueSet());
+        if (codes != null && !codes.isEmpty()) {
+            var expansion = newExpansion().addParameter(createNaiveParameter());
+            for (var code : codes) {
+                expansion
+                        .addContains()
+                        .setCode(code.getCode())
+                        .setSystem(code.getSystem())
+                        .setVersion(code.getVersion())
+                        .setDisplay(code.getDisplay());
+            }
+            getValueSet().setExpansion(expansion);
         }
-        getValueSet().setExpansion(expansion);
     }
 }
diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/r5/ValueSetAdapter.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/adapter/r5/ValueSetAdapter.java
@@ -150,16 +150,18 @@ public ValueSet.ValueSetExpansionParameterComponent createNaiveParameter() {
 
     @Override
     public void naiveExpand() {
-        var expansion = newExpansion().addParameter(createNaiveParameter());
-
-        for (var code : getCodesInCompose(fhirContext, getValueSet())) {
-            expansion
-                    .addContains()
-                    .setCode(code.getCode())
-                    .setSystem(code.getSystem())
-                    .setVersion(code.getVersion())
-                    .setDisplay(code.getDisplay());
+        var codes = getCodesInCompose(fhirContext, getValueSet());
+        if (codes != null && !codes.isEmpty()) {
+            var expansion = newExpansion().addParameter(createNaiveParameter());
+            for (var code : codes) {
+                expansion
+                        .addContains()
+                        .setCode(code.getCode())
+                        .setSystem(code.getSystem())
+                        .setVersion(code.getVersion())
+                        .setDisplay(code.getDisplay());
+            }
+            getValueSet().setExpansion(expansion);
         }
-        getValueSet().setExpansion(expansion);
     }
 }