[APHL-1180] fix bad conditional

cqframework · Dec 18, 2024 · c1a3401 · c1a3401
1 parent 6b51722
commit c1a3401
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/PackageVisitor.java b/cqf-fhir-cr/src/main/java/org/opencds/cqf/fhir/cr/visitor/PackageVisitor.java
@@ -214,21 +214,19 @@ protected void handleValueSets(IBaseBundle packagedBundle, Optional<IBaseResourc
             var elapsed = String.valueOf(((new Date()).getTime() - startCache) / 1000);
             myLogger.info("retrieved cached ValueSet Expansions in: {}s", elapsed);
         }
-        valueSets.forEach(valueSet -> {
+        missingInCache.forEach(valueSet -> {
             var url = valueSet.getUrl();
-            if (!expandedList.contains(url)) {
-                var expansionStartTime = new Date().getTime();
-                expandHelper.expandValueSet(
-                        valueSet,
-                        params,
-                        terminologyEndpoint.map(e -> (IEndpointAdapter) createAdapterForResource(e)),
-                        valueSets,
-                        expandedList,
-                        new Date());
-                var elapsed = String.valueOf(((new Date()).getTime() - expansionStartTime) / 1000);
-                myLogger.info("Expanded {} in {}s", url, elapsed);
-            }
-            if (expansionCache.isPresent() && missingInCache.contains(valueSet)) {
+            var expansionStartTime = new Date().getTime();
+            expandHelper.expandValueSet(
+                    valueSet,
+                    params,
+                    terminologyEndpoint.map(e -> (IEndpointAdapter) createAdapterForResource(e)),
+                    valueSets,
+                    expandedList,
+                    new Date());
+            var elapsed = String.valueOf(((new Date()).getTime() - expansionStartTime) / 1000);
+            myLogger.info("Expanded {} in {}s", url, elapsed);
+            if (expansionCache.isPresent()) {
                 expansionCache.get().addToCache(valueSet, expansionParamsHash.orElse(null));
             }
         });