eRSDTransformer experimental fix, PlanDef reference removal (#449)

cqframework · Jun 30, 2023 · 97069de · 97069de
1 parent c40cdfe
commit 97069de
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/tooling/src/main/java/org/opencds/cqf/tooling/casereporting/transformer/ErsdTransformer.java b/tooling/src/main/java/org/opencds/cqf/tooling/casereporting/transformer/ErsdTransformer.java
@@ -212,7 +212,7 @@ private Library createSpecificationLibrary() {
         specificationLibrary.setDescription(
                 "Defines the asset-collection library containing the US Public Health specification assets.");
         specificationLibrary.setStatus(PublicationStatus.ACTIVE);
-        specificationLibrary.setExperimental(true);
+        specificationLibrary.setExperimental(false);
         specificationLibrary.setPublisher(PUBLISHER);
         specificationLibrary.setUrl("http://ersd.aimsplatform.org/fhir/Library/SpecificationLibrary");
         specificationLibrary.setType(new CodeableConcept(
@@ -276,7 +276,7 @@ private IBaseOperationOutcome resolvePlanDefinition(PlanDefinition res, Library
         // });
         // res.setVersion(this.version);
         // res.setPublisher(PUBLISHER);
-        // res.setExperimental(true);
+        // res.setExperimental(false);
         // res.setDescription("Example Description");
         return null;
     }
@@ -365,14 +365,7 @@ private IBaseOperationOutcome resolveTriggeringValueSet(ValueSet res, Library sp
 
         // Update Grouping ValueSet references (in useContexts) to PlanDefinition
         List<UsageContext> useContexts = res.getUseContext();
-
-        if (v2PlanDefinition != null) {
-            useContexts.stream().forEach(uc -> {
-                if (uc.hasValueReference() && uc.getValueReference().hasReference() && uc.getValueReference().getReference().contains("skeleton")) {
-                    uc.setValue(new Reference(v2PlanDefinition.getId()));
-                }
-            });
-        }
+        res.getUseContext().removeIf(uc -> uc.hasValueReference() && uc.getValueReference().hasReference() && uc.getValueReference().getReference().contains("skeleton"));
 
         boolean hasPriorityUseContext = false;
         for (UsageContext uc : useContexts) {
@@ -431,7 +424,7 @@ private IBaseOperationOutcome resolveTriggeringValueSet(ValueSet res, Library sp
             compose.getInclude().remove(include);
         }
 
-        res.setExperimental(true);
+        res.setExperimental(false);
         return null;
     }