diff --git a/.gitignore b/.gitignore index 6a9b8fc66..d3bf2b2e0 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ core.* heapdump.* javacore.* Snap.* +**/test-output diff --git a/engine.fhir/pom.xml b/engine.fhir/pom.xml index 32820c93f..a3e687521 100644 --- a/engine.fhir/pom.xml +++ b/engine.fhir/pom.xml @@ -9,7 +9,6 @@ 1.5.10-SNAPSHOT - org.opencds.cqf.cql engine.fhir 1.5.10-SNAPSHOT jar @@ -24,6 +23,24 @@ engine 1.5.10-SNAPSHOT + + + + org.apache.commons + commons-text + + + + + org.jvnet.jaxb2_commons + jaxb2-basics-runtime + + + + jakarta.xml.bind + jakarta.xml.bind-api + + ca.uhn.hapi.fhir hapi-fhir-client @@ -48,6 +65,7 @@ ca.uhn.hapi.fhir hapi-fhir-structures-r5 + xpp3 xpp3 @@ -63,6 +81,37 @@ wiremock-jre8 test + + org.eclipse.persistence + org.eclipse.persistence.moxy + test + + + + info.cqframework + cql-to-elm + test + + + info.cqframework + fhir-r4 + test + + + info.cqframework + quick + test + + + info.cqframework + model-jackson + test + + + info.cqframework + elm-jackson + test + @@ -103,7 +152,7 @@ org.jvnet.jaxb2_commons jaxb2-basics - 0.12.0 + 0.13.1 org.jvnet.jaxb2_commons diff --git a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu2FhirModelResolver.java b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu2FhirModelResolver.java index 3e03e89e7..2b1ac65f8 100644 --- a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu2FhirModelResolver.java +++ b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu2FhirModelResolver.java @@ -47,7 +47,7 @@ public Dstu2FhirModelResolver() { this(FhirContext.forDstu2()); } - private Dstu2FhirModelResolver(FhirContext fhirContext) { + protected Dstu2FhirModelResolver(FhirContext fhirContext) { super(fhirContext); this.setPackageNames(Arrays.asList("ca.uhn.fhir.model.dstu2", "org.hl7.fhir.dstu2.model", "ca.uhn.fhir.model.primitive")); if (fhirContext.getVersion().getVersion() != FhirVersionEnum.DSTU2) { diff --git a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java index ccf440862..f2f15dfda 100644 --- a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java +++ b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/Dstu3FhirModelResolver.java @@ -48,7 +48,7 @@ public Dstu3FhirModelResolver() { this(FhirContext.forDstu3()); } - private Dstu3FhirModelResolver(FhirContext fhirContext) { + protected Dstu3FhirModelResolver(FhirContext fhirContext) { super(fhirContext); this.setPackageNames(Arrays.asList("org.hl7.fhir.dstu3.model")); if (fhirContext.getVersion().getVersion() != FhirVersionEnum.DSTU3) { diff --git a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java index 6c72fb50a..e547fa3fa 100644 --- a/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java +++ b/engine.fhir/src/main/java/org/opencds/cqf/cql/engine/fhir/model/R4FhirModelResolver.java @@ -49,7 +49,7 @@ public R4FhirModelResolver() { this(FhirContext.forR4()); } - private R4FhirModelResolver(FhirContext fhirContext) { + protected R4FhirModelResolver(FhirContext fhirContext) { super(fhirContext); this.setPackageNames(Arrays.asList("org.hl7.fhir.r4.model")); if (fhirContext.getVersion().getVersion() != FhirVersionEnum.R4) { diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsDstu3Test.java b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsDstu3Test.java new file mode 100644 index 000000000..0aa8e7223 --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsDstu3Test.java @@ -0,0 +1,215 @@ +package org.hl7.fhirpath; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; +import com.google.common.collect.Sets; +import org.fhir.ucum.UcumException; +import org.hl7.fhir.dstu3.model.*; +import org.hl7.fhirpath.tests.Group; +import org.opencds.cqf.cql.engine.data.CompositeDataProvider; +import org.opencds.cqf.cql.engine.elm.execution.EqualEvaluator; +import org.opencds.cqf.cql.engine.execution.Context; +import org.opencds.cqf.cql.engine.fhir.model.CachedDstu3FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; +import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; +import org.opencds.cqf.cql.engine.runtime.Code; +import org.testng.ITest; +import org.testng.SkipException; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +public class CQLOperationsDstu3Test extends TestFhirPath implements ITest { + private static FhirContext fhirContext = FhirContext.forCached(FhirVersionEnum.DSTU3); + private static Dstu3FhirModelResolver fhirModelResolver = new CachedDstu3FhirModelResolver(); + private static RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider( + new SearchParameterResolver(fhirContext), + fhirModelResolver, + fhirContext.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu3") + ); + private static CompositeDataProvider provider = new CompositeDataProvider(fhirModelResolver, retrieveProvider); + + private final String file; + private final org.hl7.fhirpath.tests.Test test; + private final Group group; + + @Factory(dataProvider = "dataMethod") + public CQLOperationsDstu3Test(String file, Group group, org.hl7.fhirpath.tests.Test test) { + this.file = file; + this.group = group; + this.test = test; + } + + @DataProvider + public static Object[][] dataMethod() { + String[] listOfFiles = { + "stu3/tests-fhir-r3.xml" + }; + + List testsToRun = new ArrayList<>(); + for (String file: listOfFiles) { + for (Group group : loadTestsFile(file).getGroup()) { + for (org.hl7.fhirpath.tests.Test test : group.getTest()) { + if (!"2.1.0".equals(test.getVersion())) { // unsupported version + testsToRun.add(new Object[] { + file, + group, + test + }); + } + } + } + } + return testsToRun.toArray(new Object[testsToRun.size()][]); + } + + public static Set SKIP = Sets.newHashSet( + "stu3/tests-fhir-r3/Dollar/testDollarOrderNotAllowed(Patient.children().skip(1))", + "stu3/tests-fhir-r3/Dollar/testDollarThis1(Patient.name.given.where(substring($this.length()-3) = 'out'))", + "stu3/tests-fhir-r3/Dollar/testDollarThis2(Patient.name.given.where(substring($this.length()-3) = 'ter'))", + "stu3/tests-fhir-r3/Literals/testLiteralDate((0).not() = false)", + "stu3/tests-fhir-r3/Literals/testLiteralDate((1).not() = false)", + "stu3/tests-fhir-r3/Literals/testLiteralDate((1|2).not() = false)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @1974-12-25T12:34:00)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @1974-12-25T12:34:00+10:00)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @1974-12-25T12:34:00-10:00)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @1974-12-25T12:34:00Z)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @T12:14)", + "stu3/tests-fhir-r3/Literals/testLiteralDate(Patient.birthDate != @T12:14:15)", + "stu3/tests-fhir-r3/Literals/testLiteralDecimal(Observation.value.value < 190)", + "stu3/tests-fhir-r3/Literals/testLiteralDecimal(Observation.value.value > 0)", + "stu3/tests-fhir-r3/Literals/testLiteralString(Patient.name.given.first() = 'Peter')", + "stu3/tests-fhir-r3/Literals/testLiteralUnicode(Patient.name.given.first() = 'P\\u0065ter')", + "stu3/tests-fhir-r3/testAll(Patient.name.select(family.exists()).all())", + "stu3/tests-fhir-r3/testAll(Patient.name.select(given.exists()).all())", + "stu3/tests-fhir-r3/testBooleanImplies((true implies {}) = {})", + "stu3/tests-fhir-r3/testBooleanImplies(({} implies false) = true)", + "stu3/tests-fhir-r3/testBooleanImplies(({} implies {}) = true)", + "stu3/tests-fhir-r3/testBooleanLogicAnd((true and {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicAnd(({} and true) = {})", + "stu3/tests-fhir-r3/testBooleanLogicAnd(({} and {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicOr((false or {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicOr(({} or false) = {})", + "stu3/tests-fhir-r3/testBooleanLogicOr(({} or {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicXOr((false xor {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicXOr((true xor {}) = {})", + "stu3/tests-fhir-r3/testBooleanLogicXOr(({} xor false) = {})", + "stu3/tests-fhir-r3/testBooleanLogicXOr(({} xor true) = {})", + "stu3/tests-fhir-r3/testBooleanLogicXOr(({} xor {}) = {})", + "stu3/tests-fhir-r3/testConcatenate((1 | 2 | 3) & 'b' = '1,2,3b')", + "stu3/tests-fhir-r3/testConcatenate(1 & 'a' = '1a')", + "stu3/tests-fhir-r3/testConcatenate(1 & 1 = '11')", + "stu3/tests-fhir-r3/testContainsString('12345'.contains('') = false)", + "stu3/tests-fhir-r3/testDistinct((1 | 2 | 3).isDistinct())", + "stu3/tests-fhir-r3/testDistinct(Questionnaire.descendants().linkId.distinct())", + "stu3/tests-fhir-r3/testDistinct(Questionnaire.descendants().linkId.isDistinct())", + "stu3/tests-fhir-r3/testDistinct(Questionnaire.descendants().linkId.select(substring(0,1)).distinct())", + "stu3/tests-fhir-r3/testDistinct(Questionnaire.descendants().linkId.select(substring(0,1)).isDistinct().not())", + "stu3/tests-fhir-r3/testDivide(1.2 / 1.8 = 0.67)", + "stu3/tests-fhir-r3/testEndsWith('12345'.endsWith('') = false)", + "stu3/tests-fhir-r3/testEquality(0.0 = 0)", + "stu3/tests-fhir-r3/testEquality(1.10 = 1.1)", + "stu3/tests-fhir-r3/testEquality(name = name.first() | name.last())", + "stu3/tests-fhir-r3/testEquality(name = name.last() | name.first())", + "stu3/tests-fhir-r3/testEquivalent(@2012-04-15 ~ @2012-04-15T10:00:00)", + "stu3/tests-fhir-r3/testEquivalent(name.given ~ name.first().given | name.last().given)", + "stu3/tests-fhir-r3/testEquivalent(name.given ~ name.last().given | name.first().given)", + "stu3/tests-fhir-r3/testExtension(Patient.birthDate.extension(%\"ext-patient-birthTime\").exists())", + "stu3/tests-fhir-r3/testExtension(Patient.birthDate.extension('http://hl7.org/fhir/StructureDefinition/patient-birthTime').exists())", + "stu3/tests-fhir-r3/testExtension(Patient.birthDate.extension('http://hl7.org/fhir/StructureDefinition/patient-birthTime1').empty())", + "stu3/tests-fhir-r3/testFirstLast(Patient.name.first().given = 'Peter' | 'James')", + "stu3/tests-fhir-r3/testFirstLast(Patient.name.last().given = 'Jim')", + "stu3/tests-fhir-r3/testIif(iif(Patient.name.empty(), 'unnamed', 'named') = 'named')", + "stu3/tests-fhir-r3/testIif(iif(Patient.name.exists(), 'named', 'unnamed') = 'named')", + "stu3/tests-fhir-r3/testIndexer(Patient.name[0].given = 'Peter' | 'James')", + "stu3/tests-fhir-r3/testIndexer(Patient.name[1].given = 'Jim')", + "stu3/tests-fhir-r3/testNEquality(0.0 != 0)", + "stu3/tests-fhir-r3/testNEquality(1.10 != 1.1)", + "stu3/tests-fhir-r3/testNEquality(name != name.first() | name.last())", + "stu3/tests-fhir-r3/testNEquality(name != name.last() | name.first())", + "stu3/tests-fhir-r3/testNotEquivalent(@2012-04-15 !~ @2012-04-15T10:00:00)", + "stu3/tests-fhir-r3/testNotEquivalent(name.given !~ name.first().given | name.last().given)", + "stu3/tests-fhir-r3/testNotEquivalent(name.given !~ name.last().given | name.first().given)", + "stu3/tests-fhir-r3/testNow(now().toString().length() > 10)", + "stu3/tests-fhir-r3/testNow(Patient.birthDate < now())", + "stu3/tests-fhir-r3/testRepeat(Questionnaire.children().concept.count() = 2)", + "stu3/tests-fhir-r3/testRepeat(Questionnaire.descendants().concept.count() = 10)", + "stu3/tests-fhir-r3/testRepeat(Questionnaire.repeat(item).concept.count() = 10)", + "stu3/tests-fhir-r3/testRepeat(ValueSet.expansion.repeat(contains).count() = 10)", + "stu3/tests-fhir-r3/testSelect(Patient.name.select(given) = 'Peter' | 'James' | 'Jim')", + "stu3/tests-fhir-r3/testSelect(Patient.name.select(given | family) = 'Peter' | 'James' | 'Chalmers' | 'Jim')", + "stu3/tests-fhir-r3/testSkip((0 | 1 | 2).skip(1) = 1 | 2)", + "stu3/tests-fhir-r3/testSkip(Patient.name.skip(1).given = 'Jim')", + "stu3/tests-fhir-r3/testStartsWith('12345'.startsWith('') = false)", + "stu3/tests-fhir-r3/testSubSetOf(Patient.name.first().subsetOf($this.name))", + "stu3/tests-fhir-r3/testSubSetOf(Patient.name.subsetOf($this.name.first()).not())", + "stu3/tests-fhir-r3/testSuperSetOf(Patient.name.first().supersetOf($this.name).not())", + "stu3/tests-fhir-r3/testSuperSetOf(Patient.name.supersetOf($this.name.first()))", + "stu3/tests-fhir-r3/testTail((0 | 1 | 2).tail() = 1 | 2)", + "stu3/tests-fhir-r3/testTail(Patient.name.tail().given = 'Jim')", + "stu3/tests-fhir-r3/testTake((0 | 1 | 2).take(2) = 0 | 1)", + "stu3/tests-fhir-r3/testTake(Patient.name.take(1).given = 'Peter' | 'James')", + "stu3/tests-fhir-r3/testTake(Patient.name.take(2).given = 'Peter' | 'James' | 'Jim')", + "stu3/tests-fhir-r3/testTake(Patient.name.take(3).given = 'Peter' | 'James' | 'Jim')", + "stu3/tests-fhir-r3/testToday(Patient.birthDate < today())", + "stu3/tests-fhir-r3/testToday(today().toString().length() = 10)", + "stu3/tests-fhir-r3/testToInteger('0.0'.toInteger().empty())", + "stu3/tests-fhir-r3/testVariables(%\"vs-administrative-gender\" = 'http://hl7.org/fhir/ValueSet/administrative-gender')", + "stu3/tests-fhir-r3/testVariables(%loinc = 'http://loinc.org')", + "stu3/tests-fhir-r3/testVariables(%sct = 'http://snomed.info/sct')", + "stu3/tests-fhir-r3/testVariables(%ucum = 'http://unitsofmeasure.org')", + "stu3/tests-fhir-r3/testWhere(Patient.name.where($this.given = 'Jim').count() = 1)", + "stu3/tests-fhir-r3/testWhere(Patient.name.where(given = 'Jim').count() = 1)", + "stu3/tests-fhir-r3/testWhere(Patient.name.where(given = 'X').count() = 0)" + ); + + @Override + public String getTestName() { + return + file.replaceAll(".xml", "") + + "/"+ group.getName() + + (test.getName() != null ? "/"+ test.getName() : "") + + "("+ test.getExpression().getValue() +")"; + } + + @Test + public void test() throws UcumException { + if (SKIP.contains(getTestName())) { + throw new SkipException("Skipping " + getTestName()); + } + + runTest(test, "stu3/input/", fhirContext, provider, fhirModelResolver); + } + + public Boolean compareResults(Object expectedResult, Object actualResult, Context context, FhirModelResolver resolver) { + // Perform FHIR system-defined type conversions + if (actualResult instanceof Enumeration) { + actualResult = ((Enumeration) actualResult).getValueAsString(); + } else if (actualResult instanceof BooleanType) { + actualResult = ((BooleanType) actualResult).getValue(); + } else if (actualResult instanceof IntegerType) { + actualResult = ((IntegerType) actualResult).getValue(); + } else if (actualResult instanceof DecimalType) { + actualResult = ((DecimalType) actualResult).getValue(); + } else if (actualResult instanceof StringType) { + actualResult = ((StringType) actualResult).getValue(); + } else if (actualResult instanceof BaseDateTimeType) { + actualResult = resolver.toJavaPrimitive(actualResult, actualResult); + } else if (actualResult instanceof Quantity) { + Quantity quantity = (Quantity) actualResult; + actualResult = new org.opencds.cqf.cql.engine.runtime.Quantity().withValue(quantity.getValue()) + .withUnit(quantity.getUnit()); + } else if (actualResult instanceof Coding) { + Coding coding = (Coding) actualResult; + actualResult = new Code().withCode(coding.getCode()).withDisplay(coding.getDisplay()) + .withSystem(coding.getSystem()).withVersion(coding.getVersion()); + } + return EqualEvaluator.equal(expectedResult, actualResult, context); + } +} diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java new file mode 100644 index 000000000..f70bfb03d --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/CQLOperationsR4Test.java @@ -0,0 +1,382 @@ +package org.hl7.fhirpath; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; +import com.google.common.collect.Sets; +import org.fhir.ucum.UcumException; +import org.hl7.fhir.r4.model.*; +import org.hl7.fhirpath.tests.Group; +import org.opencds.cqf.cql.engine.data.CompositeDataProvider; +import org.opencds.cqf.cql.engine.elm.execution.EqualEvaluator; +import org.opencds.cqf.cql.engine.execution.Context; +import org.opencds.cqf.cql.engine.fhir.model.CachedR4FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; +import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; +import org.opencds.cqf.cql.engine.runtime.Code; +import org.testng.ITest; +import org.testng.SkipException; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +public class CQLOperationsR4Test extends TestFhirPath implements ITest { + + private static FhirContext fhirContext = FhirContext.forCached(FhirVersionEnum.R4); + private static R4FhirModelResolver fhirModelResolver = new CachedR4FhirModelResolver(); + private static RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider( + new SearchParameterResolver(fhirContext), + fhirModelResolver, + fhirContext.newRestfulGenericClient("http://fhirtest.uhn.ca/baseR4") + ); + private static CompositeDataProvider provider = new CompositeDataProvider(fhirModelResolver, retrieveProvider); + + private final String file; + private final org.hl7.fhirpath.tests.Test test; + private final org.hl7.fhirpath.tests.Group group; + + @Factory(dataProvider = "dataMethod") + public CQLOperationsR4Test(String file, Group group, org.hl7.fhirpath.tests.Test test) { + this.file = file; + this.group = group; + this.test = test; + } + + @DataProvider + public static Object[][] dataMethod() { + String[] listOfFiles = { + "r4/tests-fhir-r4.xml", + "cql/CqlAggregateFunctionsTest.xml", + "cql/CqlAggregateTest.xml", + "cql/CqlArithmeticFunctionsTest.xml", + "cql/CqlComparisonOperatorsTest.xml", + "cql/CqlConditionalOperatorsTest.xml", + "cql/CqlDateTimeOperatorsTest.xml", + "cql/CqlErrorsAndMessagingOperatorsTest.xml", + "cql/CqlIntervalOperatorsTest.xml", + "cql/CqlListOperatorsTest.xml", + "cql/CqlLogicalOperatorsTest.xml", + "cql/CqlNullologicalOperatorsTest.xml", + "cql/CqlStringOperatorsTest.xml", + "cql/CqlTypeOperatorsTest.xml", + "cql/CqlTypesTest.xml", + "cql/ValueLiteralsAndSelectors.xml" + }; + + List testsToRun = new ArrayList<>(); + for (String file: listOfFiles) { + for (Group group : loadTestsFile(file).getGroup()) { + for (org.hl7.fhirpath.tests.Test test : group.getTest()) { + if (!"2.1.0".equals(test.getVersion())) { // unsupported version + testsToRun.add(new Object[] { + file, + group, + test + }); + } + } + } + } + return testsToRun.toArray(new Object[testsToRun.size()][]); + } + + public static Set SKIP = Sets.newHashSet( + "cql/CqlAggregateTest/AggregateTests/FactorialOfFive", + "cql/CqlAggregateTest/AggregateTests/RolledOutIntervals", + + "cql/CqlArithmeticFunctionsTest/Divide/Divide1Q1Q", + + "cql/CqlArithmeticFunctionsTest/Ln/Ln1000D", + "cql/CqlArithmeticFunctionsTest/Ln/Ln1000", + "cql/CqlArithmeticFunctionsTest/Log/Log1Base1", + "cql/CqlArithmeticFunctionsTest/MaxValue/DecimalMaxValue", + "cql/CqlArithmeticFunctionsTest/MinValue/DecimalMinValue", + "cql/CqlArithmeticFunctionsTest/MinValue/LongMinValue", + "cql/CqlArithmeticFunctionsTest/Multiply/Multiply1CMBy2CM", + "cql/CqlArithmeticFunctionsTest/Truncated Divide/TruncatedDivide10LBy3L", + + "cql/CqlComparisonOperatorsTest/Equal/QuantityEqCM1M01", + "cql/CqlComparisonOperatorsTest/Equivalent/EquivEqCM1M01", + "cql/CqlComparisonOperatorsTest/Greater/GreaterM1CM1", + "cql/CqlComparisonOperatorsTest/Greater/GreaterM1CM10", + "cql/CqlComparisonOperatorsTest/Greater Or Equal/GreaterOrEqualM1CM1", + "cql/CqlComparisonOperatorsTest/Greater Or Equal/GreaterOrEqualM1CM10", + "cql/CqlComparisonOperatorsTest/Less/LessM1CM1", + "cql/CqlComparisonOperatorsTest/Less/LessM1CM10", + "cql/CqlComparisonOperatorsTest/Less Or Equal/LessOrEqualM1CM1", + "cql/CqlComparisonOperatorsTest/Less Or Equal/LessOrEqualM1CM10", + "cql/CqlComparisonOperatorsTest/Not Equal/QuantityNotEqCM1M01", + + "cql/CqlDateTimeOperatorsTest/DateTimeComponentFrom/DateTimeComponentFromTimezone", + "cql/CqlDateTimeOperatorsTest/Duration/DateTimeDurationBetweenYear", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DateTimeDurationBetweenUncertainAdd", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DateTimeDurationBetweenUncertainInterval", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DateTimeDurationBetweenUncertainInterval2", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DateTimeDurationBetweenUncertainMultiply", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DateTimeDurationBetweenUncertainSubtract", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DurationInDaysA", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/DurationInDaysAA", + "cql/CqlDateTimeOperatorsTest/Uncertainty tests/TimeDurationBetweenHourDiffPrecision", + + "cql/CqlIntervalOperatorsTest/Expand/ExpandIntervalPer2", + "cql/CqlIntervalOperatorsTest/Expand/ExpandPer0D1", + "cql/CqlIntervalOperatorsTest/Expand/ExpandPer1", + "cql/CqlIntervalOperatorsTest/Expand/ExpandPer2Days", + "cql/CqlIntervalOperatorsTest/Expand/ExpandPerMinute", + + "cql/CqlListOperatorsTest/Distinct/DistinctANullANull", + "cql/CqlListOperatorsTest/Distinct/DistinctNullNullNull", + "cql/CqlListOperatorsTest/Equivalent/Equivalent123AndABC", + "cql/CqlListOperatorsTest/Equivalent/Equivalent123AndString123", + "cql/CqlListOperatorsTest/Equivalent/EquivalentABCAnd123", + "cql/CqlListOperatorsTest/Flatten/FlattenListNullAndNull", + "cql/CqlListOperatorsTest/IncludedIn/IncludedInNullRight", + "cql/CqlListOperatorsTest/Includes/IncludesNullLeft", + "cql/CqlListOperatorsTest/Includes/IncludesNullRight", + "cql/CqlListOperatorsTest/IndexOf/IndexOfEmptyNull", + "cql/CqlListOperatorsTest/IndexOf/IndexOfNullIn1Null", + "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndABC", + "cql/CqlListOperatorsTest/NotEqual/NotEqual123AndString123", + "cql/CqlListOperatorsTest/NotEqual/NotEqualABCAnd123", + "cql/CqlListOperatorsTest/ProperContains/ProperContainsNullRightFalse", + "cql/CqlListOperatorsTest/ProperContains/ProperContainsTimeNull", + "cql/CqlListOperatorsTest/ProperIn/ProperInTimeNull", + "cql/CqlListOperatorsTest/ProperlyIncludedIn/ProperlyIncludedInNulRight", + "cql/CqlListOperatorsTest/ProperlyIncludes/ProperlyIncludesNullLeft", + "cql/CqlListOperatorsTest/Union/UnionListNullAndListNull", + + "cql/CqlStringOperatorsTest/toString tests/DateTimeToString3", + + "cql/CqlTypeOperatorsTest/As/AsQuantity", + "cql/CqlTypeOperatorsTest/As/CastAsQuantity", + "cql/CqlTypeOperatorsTest/Convert/StringToDateTimeMalformed", + "cql/CqlTypeOperatorsTest/Convert/StringToIntegerError", + "cql/CqlTypeOperatorsTest/ToDateTime/ToDateTime4", + "cql/CqlTypeOperatorsTest/ToDateTime/ToDateTime5", + "cql/CqlTypeOperatorsTest/ToDateTime/ToDateTimeMalformed", + "cql/CqlTypeOperatorsTest/ToTime/ToTime2", + "cql/CqlTypeOperatorsTest/ToTime/ToTime3", + "cql/CqlTypeOperatorsTest/ToTime/ToTime4", + "cql/CqlTypeOperatorsTest/ToTime/ToTimeMalformed", + + "cql/CqlTypesTest/DateTime/DateTimeUncertain", + "cql/CqlTypesTest/Time/TimeUpperBoundMillis", + + "cql/ValueLiteralsAndSelectors/Boolean/BooleanFalse", + "cql/ValueLiteralsAndSelectors/Boolean/BooleanTrue", + "cql/ValueLiteralsAndSelectors/Decimal/Decimal10Pow28", + "cql/ValueLiteralsAndSelectors/Decimal/DecimalNeg10Pow28", + "cql/ValueLiteralsAndSelectors/Decimal/DecimalNegTenthStep", + "cql/ValueLiteralsAndSelectors/Decimal/DecimalPos10Pow28", + "cql/ValueLiteralsAndSelectors/Decimal/DecimalPosTenthStep", + "cql/ValueLiteralsAndSelectors/Decimal/DecimalTenthStep", + "cql/ValueLiteralsAndSelectors/Null/Null", + + "r4/tests-fhir-r4/from-Zulip/(true and 'foo').empty()", + "r4/tests-fhir-r4/from-Zulip/(true | 'foo').allTrue()", + "r4/tests-fhir-r4/testAggregate/testAggregate1", + "r4/tests-fhir-r4/testAggregate/testAggregate2", + "r4/tests-fhir-r4/testAggregate/testAggregate3", + "r4/tests-fhir-r4/testAggregate/testAggregate4", + "r4/tests-fhir-r4/testAll/testAllTrue4", + "r4/tests-fhir-r4/testCollectionBoolean/testCollectionBoolean2", + "r4/tests-fhir-r4/testCollectionBoolean/testCollectionBoolean3", + "r4/tests-fhir-r4/testCollectionBoolean/testCollectionBoolean4", + "r4/tests-fhir-r4/testCollectionBoolean/testCollectionBoolean5", + "r4/tests-fhir-r4/testCollectionBoolean/testCollectionBoolean6", + "r4/tests-fhir-r4/testConformsTo/testConformsTo1", + "r4/tests-fhir-r4/testConformsTo/testConformsTo2", + "r4/tests-fhir-r4/testDistinct/testDistinct1", + "r4/tests-fhir-r4/testDistinct/testDistinct2", + "r4/tests-fhir-r4/testDistinct/testDistinct3", + "r4/tests-fhir-r4/testDistinct/testDistinct5", + "r4/tests-fhir-r4/testDistinct/testDistinct6", + "r4/tests-fhir-r4/testDollar/testDollarOrderNotAllowed", + "r4/tests-fhir-r4/testEquality/testEquality21", + "r4/tests-fhir-r4/testEquality/testEquality22", + "r4/tests-fhir-r4/testEquality/testEquality26", + "r4/tests-fhir-r4/testEquality/testEquality27", + "r4/tests-fhir-r4/testEquivalent/testEquivalent11", + "r4/tests-fhir-r4/testEquivalent/testEquivalent17", + "r4/tests-fhir-r4/testEquivalent/testEquivalent20", + "r4/tests-fhir-r4/testEquivalent/testEquivalent21", + "r4/tests-fhir-r4/testExclude/testExclude1", + "r4/tests-fhir-r4/testExclude/testExclude2", + "r4/tests-fhir-r4/testExclude/testExclude3", + "r4/tests-fhir-r4/testExclude/testExclude4", + "r4/tests-fhir-r4/testExtension/testExtension1", + "r4/tests-fhir-r4/testExtension/testExtension2", + "r4/tests-fhir-r4/testExtension/testExtension3", + "r4/tests-fhir-r4/testFirstLast/testFirstLast1", + "r4/tests-fhir-r4/testFirstLast/testFirstLast2", + "r4/tests-fhir-r4/testGreaterThan/testGreaterThan26", + "r4/tests-fhir-r4/testGreaterThan/testGreaterThan27", + "r4/tests-fhir-r4/testGreatorOrEqual/testGreatorOrEqual26", + "r4/tests-fhir-r4/testGreatorOrEqual/testGreatorOrEqual27", + "r4/tests-fhir-r4/testIif/testIif1", + "r4/tests-fhir-r4/testIif/testIif2", + "r4/tests-fhir-r4/testIif/testIif3", + "r4/tests-fhir-r4/testIif/testIif4", + "r4/tests-fhir-r4/testIndexer/testIndexer1", + "r4/tests-fhir-r4/testIntersect/testIntersect1", + "r4/tests-fhir-r4/testIntersect/testIntersect2", + "r4/tests-fhir-r4/testIntersect/testIntersect3", + "r4/tests-fhir-r4/testIntersect/testIntersect4", + "r4/tests-fhir-r4/testInvariants/extension('http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-scoring').exists() and extension('http://hl7.org/fhir/us/cqfmeasures/StructureDefinition/cqfm-scoring').value = 'ratio' implies group.population.where(code.coding.where(system = 'http://terminology.hl7.org/CodeSystem/measure-population').code = 'initial-population').count() in (1 | 2)", + "r4/tests-fhir-r4/testLessOrEqual/testLessOrEqual26", + "r4/tests-fhir-r4/testLessOrEqual/testLessOrEqual27", + "r4/tests-fhir-r4/testLessThan/testLessThan26", + "r4/tests-fhir-r4/testLessThan/testLessThan27", + "r4/tests-fhir-r4/testLiterals/testDateGreaterThanDate", + "r4/tests-fhir-r4/testLiterals/testDateNotEqualTimeMinute", + "r4/tests-fhir-r4/testLiterals/testDateNotEqualTimeSecond", + "r4/tests-fhir-r4/testLiterals/testDateNotEqualToday", + "r4/tests-fhir-r4/testLiterals/testDateTimeGreaterThanDate1", + "r4/tests-fhir-r4/testLiterals/testLiteralDateTimeTZGreater", + "r4/tests-fhir-r4/testLiterals/testLiteralDateTimeTZLess", + "r4/tests-fhir-r4/testLiterals/testLiteralDecimalGreaterThanIntegerTrue", + "r4/tests-fhir-r4/testLiterals/testLiteralDecimalLessThanInteger", + "r4/tests-fhir-r4/testLiterals/testLiteralDecimalLessThanInvalid", + "r4/tests-fhir-r4/testMatches/testMatchesSingleLineMode1", + "r4/tests-fhir-r4/testMatches/testMatchesWithinUrl1", + "r4/tests-fhir-r4/testNEquality/testNEquality15", + "r4/tests-fhir-r4/testNEquality/testNEquality16", + "r4/tests-fhir-r4/testNEquality/testNEquality20", + "r4/tests-fhir-r4/testNEquality/testNEquality21", + "r4/tests-fhir-r4/testNEquality/testNEquality24", + "r4/tests-fhir-r4/testNotEquivalent/testNotEquivalent13", + "r4/tests-fhir-r4/testNotEquivalent/testNotEquivalent17", + "r4/tests-fhir-r4/testNotEquivalent/testNotEquivalent20", + "r4/tests-fhir-r4/testNotEquivalent/testNotEquivalent21", + "r4/tests-fhir-r4/testNow/testNow1", + "r4/tests-fhir-r4/testNow/testNow2", + "r4/tests-fhir-r4/testNow/testNow3", + "r4/tests-fhir-r4/testPower/testPower3", + "r4/tests-fhir-r4/testPrecedence/testPrecedence3", + "r4/tests-fhir-r4/testPrecedence/testPrecedence4", + "r4/tests-fhir-r4/testQuantity/testQuantity1", + "r4/tests-fhir-r4/testQuantity/testQuantity2", + "r4/tests-fhir-r4/testQuantity/testQuantity3", + "r4/tests-fhir-r4/testQuantity/testQuantity4", + "r4/tests-fhir-r4/testQuantity/testQuantity5", + "r4/tests-fhir-r4/testQuantity/testQuantity6", + "r4/tests-fhir-r4/testQuantity/testQuantity7", + "r4/tests-fhir-r4/testQuantity/testQuantity8", + "r4/tests-fhir-r4/testQuantity/testQuantity9", + "r4/tests-fhir-r4/testQuantity/testQuantity10", + "r4/tests-fhir-r4/testQuantity/testQuantity11", + "r4/tests-fhir-r4/testRepeat/testRepeat1", + "r4/tests-fhir-r4/testRepeat/testRepeat2", + "r4/tests-fhir-r4/testRepeat/testRepeat3", + "r4/tests-fhir-r4/testRepeat/testRepeat4", + "r4/tests-fhir-r4/testSelect/testSelect1", + "r4/tests-fhir-r4/testSingle/testSingle2", + "r4/tests-fhir-r4/testSkip/testSkip1", + "r4/tests-fhir-r4/testSkip/testSkip3", + "r4/tests-fhir-r4/testSqrt/testSqrt2", + "r4/tests-fhir-r4/testSubSetOf/testSubSetOf1", + "r4/tests-fhir-r4/testSubSetOf/testSubSetOf2", + "r4/tests-fhir-r4/testSuperSetOf/testSuperSetOf1", + "r4/tests-fhir-r4/testSuperSetOf/testSuperSetOf2", + "r4/tests-fhir-r4/testTail/testTail1", + "r4/tests-fhir-r4/testTail/testTail2", + "r4/tests-fhir-r4/testTake/testTake2", + "r4/tests-fhir-r4/testTake/testTake3", + "r4/tests-fhir-r4/testTake/testTake4", + "r4/tests-fhir-r4/testTimeOfDay/testTimeOfDay1", + "r4/tests-fhir-r4/testToChars/testToChars1", + "r4/tests-fhir-r4/testToday/testToday1", + "r4/tests-fhir-r4/testToday/testToday2", + "r4/tests-fhir-r4/testToday/testToday3", + "r4/tests-fhir-r4/testToInteger/testToInteger4", + "r4/tests-fhir-r4/testTrace/testTrace2", + "r4/tests-fhir-r4/testType/testType1", + "r4/tests-fhir-r4/testType/testType2", + "r4/tests-fhir-r4/testType/testType3", + "r4/tests-fhir-r4/testType/testType4", + "r4/tests-fhir-r4/testType/testType6", + "r4/tests-fhir-r4/testType/testType9", + "r4/tests-fhir-r4/testType/testType10", + "r4/tests-fhir-r4/testType/testType13", + "r4/tests-fhir-r4/testType/testType14", + "r4/tests-fhir-r4/testType/testType15", + "r4/tests-fhir-r4/testType/testType16", + "r4/tests-fhir-r4/testType/testType18", + "r4/tests-fhir-r4/testType/testType19", + "r4/tests-fhir-r4/testType/testType20", + "r4/tests-fhir-r4/testType/testType21", + "r4/tests-fhir-r4/testType/testType22", + "r4/tests-fhir-r4/testType/testType23", + "r4/tests-fhir-r4/testTypes/testBooleanLiteralConvertsToQuantity", + "r4/tests-fhir-r4/testTypes/testBooleanLiteralIsNotSystemQuantity", + "r4/tests-fhir-r4/testTypes/testDecimalLiteralIsNotQuantity", + "r4/tests-fhir-r4/testTypes/testDecimalLiteralToDecimal", + "r4/tests-fhir-r4/testTypes/testDecimalLiteralToIntegerIsEmpty", + "r4/tests-fhir-r4/testTypes/testIntegerLiteralIsSystemInteger", + "r4/tests-fhir-r4/testTypes/testIntegerLiteralToInteger", + "r4/tests-fhir-r4/testTypes/testQuantityLiteralWeekToString", + "r4/tests-fhir-r4/testTypes/testStringDecimalLiteralIsNotSystemQuantity", + "r4/tests-fhir-r4/testTypes/testStringIntegerLiteralIsNotQuantity", + "r4/tests-fhir-r4/testTypes/testStringLiteralToString", + "r4/tests-fhir-r4/testTypes/testStringQuantityWeekConvertsToQuantityFalse", + "r4/tests-fhir-r4/testUnion/testUnion4", + "r4/tests-fhir-r4/testUnion/testUnion5", + "r4/tests-fhir-r4/testUnion/testUnion8", + "r4/tests-fhir-r4/testVariables/testVariables1", + "r4/tests-fhir-r4/testVariables/testVariables2", + "r4/tests-fhir-r4/testVariables/testVariables3", + "r4/tests-fhir-r4/testVariables/testVariables4", + "r4/tests-fhir-r4/testWhere/testWhere2", + "r4/tests-fhir-r4/testWhere/testWhere3", + "r4/tests-fhir-r4/testWhere/testWhere4" + ); + + @Override + public String getTestName() { + return + file.replaceAll(".xml", "") +"/"+ + group.getName() +"/"+ + (test.getName() != null ? test.getName() : test.getExpression().getValue()); + } + + @Test + public void test() throws UcumException { + if (SKIP.contains(getTestName())) { + throw new SkipException("Skipping " + getTestName()); + } + + runTest(test, "r4/input/", fhirContext, provider, fhirModelResolver); + } + + @Override + public Boolean compareResults(Object expectedResult, Object actualResult, Context context, FhirModelResolver resolver) { + // Perform FHIR system-defined type conversions + if (actualResult instanceof Enumeration) { + actualResult = ((Enumeration) actualResult).getValueAsString(); + } else if (actualResult instanceof BooleanType) { + actualResult = ((BooleanType) actualResult).getValue(); + } else if (actualResult instanceof IntegerType) { + actualResult = ((IntegerType) actualResult).getValue(); + } else if (actualResult instanceof DecimalType) { + actualResult = ((DecimalType) actualResult).getValue(); + } else if (actualResult instanceof StringType) { + actualResult = ((StringType) actualResult).getValue(); + } else if (actualResult instanceof BaseDateTimeType) { + actualResult = resolver.toJavaPrimitive(actualResult, actualResult); + } else if (actualResult instanceof Quantity) { + Quantity quantity = (Quantity) actualResult; + actualResult = new org.opencds.cqf.cql.engine.runtime.Quantity().withValue(quantity.getValue()) + .withUnit(quantity.getUnit()); + } else if (actualResult instanceof Coding) { + Coding coding = (Coding) actualResult; + actualResult = new Code().withCode(coding.getCode()).withDisplay(coding.getDisplay()) + .withSystem(coding.getSystem()).withVersion(coding.getVersion()); + } + return EqualEvaluator.equal(expectedResult, actualResult, context); + } +} diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/DateTypeTest.java b/engine.fhir/src/test/java/org/hl7/fhirpath/DateTypeTest.java new file mode 100644 index 000000000..5be2046b9 --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/DateTypeTest.java @@ -0,0 +1,33 @@ +package org.hl7.fhirpath; + +import org.hl7.fhir.r4.model.DateType; +import org.testng.annotations.Test; + +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.TimeZone; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class DateTypeTest { + @Test + public void testDateType() { + // DateType Month is zero-based (11 == December) + DateType birthDate = new DateType(1974, 11, 25); + assertThat(birthDate.getYear(), is(1974)); + assertThat(birthDate.getMonth(), is(11)); + assertThat(birthDate.getDay(), is(25)); + } + + @Test + public void testDate() { + // NOTE: DateType uses default GMT + java.util.Date birthDate = new DateType(1974, 11, 25).getValue(); + GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT")); + calendar.setTime(birthDate); + assertThat(calendar.get(Calendar.YEAR), is(1974)); + assertThat(calendar.get(Calendar.MONTH), is(11)); + assertThat(calendar.get(Calendar.DAY_OF_MONTH), is(25)); + } +} diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu2Test.java b/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu2Test.java new file mode 100644 index 000000000..3b129f44a --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu2Test.java @@ -0,0 +1,68 @@ +package org.hl7.fhirpath; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; +import org.cqframework.cql.elm.execution.Library; +import org.fhir.ucum.UcumException; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +import org.opencds.cqf.cql.engine.data.CompositeDataProvider; +import org.opencds.cqf.cql.engine.execution.Context; +import org.opencds.cqf.cql.engine.fhir.model.Dstu2FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; + +public class FhirHelpersDstu2Test { + private TranslatorHelper translator = new TranslatorHelper(); + + private String getStringFromResourceStream(String resourceName) { + java.io.InputStream input = TestFhirPath.class.getResourceAsStream(resourceName); + try (BufferedReader stringReader = new BufferedReader(new InputStreamReader(input))) { + String line = null; + StringBuilder source = new StringBuilder(); + while ((line = stringReader.readLine()) != null) { + source.append(line); + source.append("\n"); + } + return source.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + + // @Test + public void testFhirHelpersDstu2() throws UcumException { + String cql = getStringFromResourceStream("Dstu2/TestFHIRHelpersDstu2.cql"); + Library library = translator.translate(cql); + Context context = new Context(library); + context.registerLibraryLoader(translator.getLibraryLoader()); + Dstu2FhirModelResolver modelResolver = new Dstu2FhirModelResolver(); + RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider( + new org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver(modelResolver.getFhirContext()), + modelResolver, FhirContext.forCached(FhirVersionEnum.DSTU2).newRestfulGenericClient("")); + CompositeDataProvider provider = new CompositeDataProvider(modelResolver, retrieveProvider); + //BaseFhirDataProvider provider = new FhirDataProviderDstu2(); + context.registerDataProvider("http://hl7.org/fhir", provider); + + // TODO - millis shouldn't be populated - issue with DateTime.fromJavaDate(Date date) + context.resolveExpressionRef("TestPeriodToInterval").getExpression().evaluate(context); +// Assert.assertEquals(((DateTime)((Interval) result).getStart()).getPartial(), new Partial(DateTime.getFields(7), new int[] {2017, 5, 6, 18, 8, 0, 0})); +// Assert.assertEquals(((DateTime)((Interval) result).getEnd()).getPartial(), new Partial(DateTime.getFields(7), new int[] {2017, 5, 6, 19, 8, 0, 0})); + context.resolveExpressionRef("TestToQuantity").getExpression().evaluate(context); + context.resolveExpressionRef("TestRangeToInterval").getExpression().evaluate(context); + context.resolveExpressionRef("TestToCode").getExpression().evaluate(context); + context.resolveExpressionRef("TestToConcept").getExpression().evaluate(context); + context.resolveExpressionRef("TestToString").getExpression().evaluate(context); + context.resolveExpressionRef("TestRequestStatusToString").getExpression().evaluate(context); + context.resolveExpressionRef("TestToDateTime").getExpression().evaluate(context); + context.resolveExpressionRef("TestToTime").getExpression().evaluate(context); + context.resolveExpressionRef("TestToInteger").getExpression().evaluate(context); + context.resolveExpressionRef("TestToDecimal").getExpression().evaluate(context); + context.resolveExpressionRef("TestToBoolean").getExpression().evaluate(context); + } + +} diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu3Test.java b/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu3Test.java new file mode 100644 index 000000000..6f2574e71 --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/FhirHelpersDstu3Test.java @@ -0,0 +1,76 @@ +package org.hl7.fhirpath; + +import ca.uhn.fhir.context.FhirContext; +import org.cqframework.cql.elm.execution.Library; +import org.fhir.ucum.UcumException; +import org.opencds.cqf.cql.engine.data.CompositeDataProvider; +import org.opencds.cqf.cql.engine.execution.Context; +import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; +import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; + +public class FhirHelpersDstu3Test { + private TranslatorHelper translator = new TranslatorHelper(); + + private String getStringFromResourceStream(String resourceName) { + java.io.InputStream input = TestFhirPath.class.getResourceAsStream(resourceName); + try (BufferedReader stringReader = new BufferedReader(new InputStreamReader(input))) { + String line = null; + StringBuilder source = new StringBuilder(); + while ((line = stringReader.readLine()) != null) { + source.append(line); + source.append("\n"); + } + return source.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + } + + // @Test + // TODO: Resolve Error: Could not load model information for model FHIR, version + // 3.0.0 because version 1.0.2 is already loaded + //@Test + public void testFhirHelpersStu3() throws UcumException { + String cql = getStringFromResourceStream("stu3/TestFHIRHelpers.cql"); + Library library = translator.translate(cql); + Context context = new Context(library); + context.registerLibraryLoader(translator.getLibraryLoader()); + + Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); + FhirContext fhirContext = modelResolver.getFhirContext(); + RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), + modelResolver, fhirContext.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu3")); + CompositeDataProvider provider = new CompositeDataProvider(modelResolver, retrieveProvider); + // BaseFhirDataProvider provider = new + // FhirDataProviderStu3().setEndpoint("http://fhirtest.uhn.ca/baseDstu3"); + context.registerDataProvider("http://hl7.org/fhir", provider); + + // TODO - fix + context.resolveExpressionRef("TestPeriodToInterval").getExpression().evaluate(context); + // Assert.assertEquals(((DateTime)((Interval) result).getStart()).getPartial(), + // new Partial(DateTime.getFields(6), new int[] {2017, 5, 6, 18, 8, 0})); + // Assert.assertEquals(((DateTime)((Interval) result).getEnd()).getPartial(), + // new Partial(DateTime.getFields(6), new int[] {2017, 5, 6, 19, 8, 0})); + context.resolveExpressionRef("TestToQuantity").getExpression().evaluate(context); + // TODO: ModelInfo bug. Not aware of SimpleQuantity + context.resolveExpressionRef("TestRangeToInterval").getExpression().evaluate(context); + context.resolveExpressionRef("TestToCode").getExpression().evaluate(context); + context.resolveExpressionRef("TestToConcept").getExpression().evaluate(context); + context.resolveExpressionRef("TestToString").getExpression().evaluate(context); + context.resolveExpressionRef("TestRequestStatusToString").getExpression().evaluate(context); + context.resolveExpressionRef("TestToDateTime").getExpression().evaluate(context); + context.resolveExpressionRef("TestToTime").getExpression().evaluate(context); + context.resolveExpressionRef("TestToInteger").getExpression().evaluate(context); + context.resolveExpressionRef("TestToDecimal").getExpression().evaluate(context); + context.resolveExpressionRef("TestToBoolean").getExpression().evaluate(context); + } + + +} diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java b/engine.fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java index faffe16f0..3429e1ee2 100644 --- a/engine.fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/TestFhirPath.java @@ -1,109 +1,47 @@ package org.hl7.fhirpath; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; import static org.opencds.cqf.cql.engine.elm.execution.ToQuantityEvaluator.toQuantity; -import java.io.BufferedReader; -import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; -import java.io.StringReader; import java.math.BigDecimal; import java.time.Instant; import java.time.ZoneOffset; import java.util.ArrayList; -import java.util.Calendar; -import java.util.GregorianCalendar; import java.util.Iterator; import java.util.List; -import java.util.TimeZone; import javax.xml.bind.JAXB; -import org.cqframework.cql.cql2elm.CqlTranslator; -import org.cqframework.cql.cql2elm.CqlTranslatorException; -import org.cqframework.cql.cql2elm.FhirLibrarySourceProvider; -import org.cqframework.cql.cql2elm.LibraryManager; -import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.elm.execution.Library; -import org.cqframework.cql.elm.tracking.TrackBack; -import org.fhir.ucum.UcumEssenceService; import org.fhir.ucum.UcumException; -import org.fhir.ucum.UcumService; -import org.hl7.fhir.r4.model.BaseDateTimeType; -import org.hl7.fhir.r4.model.BooleanType; -import org.hl7.fhir.r4.model.Coding; -import org.hl7.fhir.r4.model.DateType; -import org.hl7.fhir.r4.model.DecimalType; -import org.hl7.fhir.r4.model.Enumeration; -import org.hl7.fhir.r4.model.IntegerType; -import org.hl7.fhir.r4.model.Quantity; -import org.hl7.fhir.r4.model.Resource; -import org.hl7.fhir.r4.model.StringType; -import org.hl7.fhirpath.tests.Group; +import org.hl7.fhir.instance.model.api.IBaseResource; import org.hl7.fhirpath.tests.InvalidType; import org.hl7.fhirpath.tests.Tests; import org.opencds.cqf.cql.engine.data.CompositeDataProvider; -import org.opencds.cqf.cql.engine.elm.execution.EqualEvaluator; import org.opencds.cqf.cql.engine.elm.execution.ExistsEvaluator; import org.opencds.cqf.cql.engine.execution.Context; -import org.opencds.cqf.cql.engine.execution.JsonCqlLibraryReader; -import org.opencds.cqf.cql.engine.execution.LibraryLoader; -import org.opencds.cqf.cql.engine.fhir.model.Dstu2FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; -import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; -import org.opencds.cqf.cql.engine.runtime.Code; +import org.opencds.cqf.cql.engine.fhir.model.FhirModelResolver; import org.opencds.cqf.cql.engine.runtime.Date; import org.opencds.cqf.cql.engine.runtime.DateTime; import org.opencds.cqf.cql.engine.runtime.Time; -import org.testng.annotations.Test; import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.FhirVersionEnum; -public class TestFhirPath { +public abstract class TestFhirPath { - private FhirContext fhirContext = FhirContext.forCached(FhirVersionEnum.DSTU3); - private Dstu3FhirModelResolver dstu3ModelResolver = new Dstu3FhirModelResolver(); - private RestFhirRetrieveProvider dstu3RetrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), - dstu3ModelResolver, fhirContext.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu3")); - private CompositeDataProvider provider = new CompositeDataProvider(dstu3ModelResolver, dstu3RetrieveProvider); - - - private FhirContext fhirContextR4 = FhirContext.forCached(FhirVersionEnum.R4); - private R4FhirModelResolver r4FhirModelResolver = new R4FhirModelResolver(); - private RestFhirRetrieveProvider r4RetrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContextR4), - r4FhirModelResolver, fhirContextR4.newRestfulGenericClient("http://fhirtest.uhn.ca/baseR4")); - private CompositeDataProvider providerR4 = new CompositeDataProvider(r4FhirModelResolver, r4RetrieveProvider); - - // private BaseFhirDataProvider provider = new - // FhirDataProviderStu3().setEndpoint("http://fhirtest.uhn.ca/baseDstu3"); - // BaseFhirDataProvider provider = new - // FhirDataProviderStu3().setEndpoint("http://fhir3.healthintersections.com.au/open/"); - // BaseFhirDataProvider provider = new - // FhirDataProviderStu3().setEndpoint("http://wildfhir.aegis.net/fhir"); - - private Tests loadTestsFile(String testsFilePath) { + public static Tests loadTestsFile(String testsFilePath) { try { InputStream testsFileRaw = TestFhirPath.class.getResourceAsStream(testsFilePath); return JAXB.unmarshal(testsFileRaw, Tests.class); } catch (Exception e) { //e.printStackTrace(); throw new IllegalArgumentException("Couldn't load tests file [" + testsFilePath + "]: " + e.toString()); - } } - private org.hl7.fhir.dstu3.model.Resource loadResourceFile(String resourceFilePath) { - return (org.hl7.fhir.dstu3.model.Resource) fhirContext.newXmlParser() - .parseResource(new InputStreamReader(TestFhirPath.class.getResourceAsStream(resourceFilePath))); - } - - private org.hl7.fhir.r4.model.Resource loadResourceFileR4(String resourceFilePath) { - return (Resource) fhirContextR4.newXmlParser() + private IBaseResource loadResourceFile(String resourceFilePath, FhirContext context) { + return context.newXmlParser() .parseResource(new InputStreamReader(TestFhirPath.class.getResourceAsStream(resourceFilePath))); } @@ -159,175 +97,7 @@ private Iterable loadExpectedResults(org.hl7.fhirpath.tests.Test test, b return results; } - private ModelManager modelManager; - - private ModelManager getModelManager() { - if (modelManager == null) { - modelManager = new ModelManager(); - } - - return modelManager; - } - - private LibraryManager libraryManager; - - private LibraryManager getLibraryManager() { - if (libraryManager == null) { - libraryManager = new LibraryManager(getModelManager()); - libraryManager.getLibrarySourceLoader().clearProviders(); - libraryManager.getLibrarySourceLoader().registerProvider(new TestLibrarySourceProvider()); - libraryManager.getLibrarySourceLoader().registerProvider(new FhirLibrarySourceProvider()); - } - return libraryManager; - } - - private LibraryLoader libraryLoader; - - private LibraryLoader getLibraryLoader() { - if (libraryLoader == null) { - libraryLoader = new TestLibraryLoader(libraryManager); - } - return libraryLoader; - } - - private Library translate(String cql) throws UcumException { - ArrayList options = new ArrayList<>(); - options.add(CqlTranslator.Options.EnableDateRangeOptimization); - UcumService ucumService = new UcumEssenceService( - UcumEssenceService.class.getResourceAsStream("/ucum-essence.xml")); - - CqlTranslator translator = CqlTranslator.fromText(cql, getModelManager(), getLibraryManager(), ucumService, - options.toArray(new CqlTranslator.Options[options.size()])); - if (translator.getErrors().size() > 0) { - ArrayList errors = new ArrayList<>(); - for (CqlTranslatorException error : translator.getErrors()) { - TrackBack tb = error.getLocator(); - String lines = tb == null ? "[n/a]" - : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), - tb.getEndChar()); - errors.add(lines + error.getMessage()); - } - throw new IllegalArgumentException(errors.toString()); - } - - String json = translator.toJxson(); - - try { - return JsonCqlLibraryReader.read(new StringReader(json)); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - return null; - } - - private Boolean compareResults(Object expectedResult, Object actualResult, Context context) { - // Perform FHIR system-defined type conversions - if (actualResult instanceof Enumeration) { - actualResult = ((Enumeration) actualResult).getValueAsString(); - } else if (actualResult instanceof BooleanType) { - actualResult = ((BooleanType) actualResult).getValue(); - } else if (actualResult instanceof IntegerType) { - actualResult = ((IntegerType) actualResult).getValue(); - } else if (actualResult instanceof DecimalType) { - actualResult = ((DecimalType) actualResult).getValue(); - } else if (actualResult instanceof StringType) { - actualResult = ((StringType) actualResult).getValue(); - } else if (actualResult instanceof BaseDateTimeType) { - actualResult = r4FhirModelResolver.toJavaPrimitive(actualResult, actualResult); - } else if (actualResult instanceof Quantity) { - Quantity quantity = (Quantity) actualResult; - actualResult = new org.opencds.cqf.cql.engine.runtime.Quantity().withValue(quantity.getValue()) - .withUnit(quantity.getUnit()); - } else if (actualResult instanceof Coding) { - Coding coding = (Coding) actualResult; - actualResult = new Code().withCode(coding.getCode()).withDisplay(coding.getDisplay()) - .withSystem(coding.getSystem()).withVersion(coding.getVersion()); - } - return EqualEvaluator.equal(expectedResult, actualResult, context); - } - - @SuppressWarnings("unchecked") - private void runStu3Test(org.hl7.fhirpath.tests.Test test) throws UcumException { - String resourceFilePath = "stu3/input/" + test.getInputfile(); - org.hl7.fhir.dstu3.model.Resource resource = loadResourceFile(resourceFilePath); - String cql = String.format( - "library TestFHIRPath using FHIR version '3.0.0' include FHIRHelpers version '3.0.0' called FHIRHelpers parameter %s %s define Test: %s", - resource.fhirType(), resource.fhirType(), test.getExpression().getValue()); - - Library library = null; - // If the test expression is invalid, expect an error during translation and - // fail if we don't get one - InvalidType invalidType = test.getExpression().getInvalid(); - if (invalidType == null) { - invalidType = InvalidType.FALSE; - } - - if (invalidType.equals(InvalidType.SEMANTIC)) { - boolean testPassed = false; - try { - library = translate(cql); - } catch (Exception e) { - testPassed = true; - } - - if (!testPassed) { - throw new RuntimeException(String.format("Expected exception not thrown for test %s.", test.getName())); - } - } else { - library = translate(cql); - Context context = new Context(library); - context.registerLibraryLoader(getLibraryLoader()); - context.registerDataProvider("http://hl7.org/fhir", provider); - context.setParameter(null, resource.fhirType(), resource); - - Object result = null; - boolean testPassed = false; - String message = null; - try { - result = context.resolveExpressionRef("Test").evaluate(context); - testPassed = invalidType.equals(InvalidType.FALSE); - } catch (Exception e) { - testPassed = invalidType.equals(InvalidType.TRUE); - message = e.getMessage(); - } - - if (!testPassed) { - if (invalidType.equals(InvalidType.TRUE)) { - throw new RuntimeException(String.format("Expected exception not thrown for test %s.", test.getName())); - } else { - throw new RuntimeException(String.format("Unexpected exception thrown for test %s: %s.", test.getName(), message)); - } - } - - if (test.isPredicate() != null && test.isPredicate().booleanValue()) { - result = ExistsEvaluator.exists(result); - } - - Iterable actualResults; - if (result instanceof Iterable) { - actualResults = (Iterable) result; - } else { - List results = new ArrayList<>(); - results.add(result); - actualResults = results; - } - - Iterable expectedResults = loadExpectedResults(test, false); - Iterator actualResultsIterator = actualResults.iterator(); - for (Object expectedResult : expectedResults) { - if (actualResultsIterator.hasNext()) { - Object actualResult = actualResultsIterator.next(); - Boolean comparison = compareResults(expectedResult, actualResult, context); - if (comparison == null || !comparison) { - throw new RuntimeException("Actual result is not equal to expected result."); - } - } else { - throw new RuntimeException("Actual result is not equal to expected result."); - } - } - } - } + abstract Boolean compareResults(Object expectedResult, Object actualResult, Context context, FhirModelResolver resolver); @SuppressWarnings("unchecked") private Iterable ensureIterable(Object result) { @@ -342,12 +112,12 @@ private Iterable ensureIterable(Object result) { return actualResults; } - private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { + protected void runTest(org.hl7.fhirpath.tests.Test test, String basePathInput, FhirContext fhirContext, CompositeDataProvider provider, FhirModelResolver resolver) throws UcumException { String cql = null; - org.hl7.fhir.r4.model.Resource resource = null; + IBaseResource resource = null; if (test.getInputfile() != null) { - String resourceFilePath = "r4/input/" + test.getInputfile(); - resource = loadResourceFileR4(resourceFilePath); + String resourceFilePath = basePathInput + test.getInputfile(); + resource = loadResourceFile(resourceFilePath, fhirContext); cql = String.format( "library TestFHIRPath using FHIR version '4.0.1' include FHIRHelpers version '4.0.1' called FHIRHelpers parameter %s %s context %s define Test:", resource.fhirType(), resource.fhirType(), resource.fhirType()); @@ -366,8 +136,7 @@ private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { else { cql = String.format("%s (%s) = %s", cql, testExpression, outputExpression); } - } - else { + } else { cql = String.format("%s %s", cql, testExpression); } @@ -379,10 +148,12 @@ private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { invalidType = InvalidType.FALSE; } + TranslatorHelper translator = new TranslatorHelper(); + if (invalidType.equals(InvalidType.SEMANTIC)) { boolean testPassed = false; try { - library = translate(cql); + library = translator.translate(cql); } catch (Exception e) { testPassed = true; } @@ -391,10 +162,21 @@ private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { throw new RuntimeException(String.format("Expected exception not thrown for test %s.", test.getName())); } } else { - library = translate(cql); + try { + library = translator.translate(cql); + } catch (IllegalArgumentException e) { + // if it crashes and didn't have an expected output, assume the test was supposed to fail. + if (test.getOutput() == null || test.getOutput().isEmpty()) { + return; + } else { + e.printStackTrace(); + throw new RuntimeException(String.format("Couldn't translate library and was expencting a result. %s.", test.getName())); + } + } + Context context = new Context(library); - context.registerLibraryLoader(getLibraryLoader()); - context.registerDataProvider("http://hl7.org/fhir", providerR4); + context.registerLibraryLoader(translator.getLibraryLoader()); + context.registerDataProvider("http://hl7.org/fhir", provider); if (resource != null) { context.setParameter(null, resource.fhirType(), resource); } @@ -423,14 +205,16 @@ private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { } Iterable actualResults = ensureIterable(result); - Iterable expectedResults = loadExpectedResults(test, isExpressionOutputTest); Iterator actualResultsIterator = actualResults.iterator(); for (Object expectedResult : expectedResults) { if (actualResultsIterator.hasNext()) { Object actualResult = actualResultsIterator.next(); - Boolean comparison = compareResults(expectedResult, actualResult, context); + Boolean comparison = compareResults(expectedResult, actualResult, context, resolver); if (comparison == null || !comparison) { + System.out.println("Failing Test: " + test.getName()); + System.out.println("- Expected Result: " + expectedResult + " (" + expectedResult.getClass() +")"); + System.out.println("- Actual Result: " + actualResult + " (" + expectedResult.getClass() +")"); throw new RuntimeException("Actual result is not equal to expected result."); } } else { @@ -439,268 +223,4 @@ private void runR4Test(org.hl7.fhirpath.tests.Test test) throws UcumException { } } } - - //@Test - public void testFhirPath() { - // Load Test cases from org/hl7/fhirpath/stu3/tests-fhir-r3.xml - // foreach test group: - // foreach test case: - // load the resource from inputFile - // create a parameter named the resource type with the value of the resource - // create a CQL library with the expression - // evaluate the expression - // validate that the result is equal to the output elements of the test - String testsFilePath = "stu3/tests-fhir-r3.xml"; - System.out.println(String.format("Running test file %s...", testsFilePath)); - Tests tests = loadTestsFile(testsFilePath); - int testCounter = 0; - int passCounter = 0; - for (Group group : tests.getGroup()) { - System.out.println(String.format("Running test group %s...", group.getName())); - for (org.hl7.fhirpath.tests.Test test : group.getTest()) { - testCounter += 1; - try { - // System.out.println(String.format("Running test %s...", test.getName())); - runStu3Test(test); - passCounter += 1; - System.out.println(String.format("Test %s passed.", test.getName())); - } catch (Exception e) { - System.out - .println(String.format("Test %s failed with exception: %s", test.getName(), e.toString())); - } - } - // System.out.println(String.format("Finished test group %s.", - // group.getName())); - } - System.out.println( - String.format("Tests file %s passed %s of %s tests.", testsFilePath, passCounter, testCounter)); - } - - private void runTests(String testsFilePath, int expectedTestCount, int expectedPassCount, int expectedSkipCount) { - System.out.println(String.format("Running test file %s...", testsFilePath)); - Tests tests = loadTestsFile(testsFilePath); - int testCounter = 0; - int skipCounter = 0; - int passCounter = 0; - for (Group group : tests.getGroup()) { - //if (group.getName() == null || !group.getName().equals("testTimeOfDay")) { - // continue; - //} - System.out.println(String.format("Running test group %s...", group.getName())); - - for (org.hl7.fhirpath.tests.Test test : group.getTest()) { - //if (test.getName() == null || !test.getName().equals("testDateNotEqualToday")) { - // continue; - //} - - testCounter += 1; - try { - if (test.getVersion() != null && test.getVersion().equals("2.1.0")) { - System.out.println(String.format("Test %s skipped (unsupported version).", test.getName())); - skipCounter += 1; - } else { - runR4Test(test); - passCounter += 1; - System.out.println(String.format("Test %s passed.", test.getName())); - } - } catch (Exception e) { - System.out - .println(String.format("Test %s failed with exception: %s", test.getName(), e.toString())); - } - } - } - System.out.println( - String.format("Tests file %s passed %s of %s tests (%s skipped).", testsFilePath, passCounter, testCounter, skipCounter)); - - assertThat(testCounter, is(expectedTestCount)); - assertThat(passCounter, is(expectedPassCount)); - assertThat(skipCounter, is(expectedSkipCount)); - } - - @Test - public void testFhirPathR4() { - runTests("r4/tests-fhir-r4.xml", 724, 561, 18); - } - - @Test - public void testCqlAggregateFunctions() { - runTests("cql/CqlAggregateFunctionsTest.xml", 39, 39, 0); - } - - @Test - public void testCqlAggregate() { - runTests("cql/CqlAggregateTest.xml", 2, 0, 0); - } - - @Test - public void testCqlArithmeticFunctions() { - runTests("cql/CqlArithmeticFunctionsTest.xml", 192, 183, 0); - } - - @Test - public void testCqlComparisonOperators() { - runTests("cql/CqlComparisonOperatorsTest.xml", 183, 172, 0); - } - - @Test - public void testCqlConditionalOperators() { - runTests("cql/CqlConditionalOperatorsTest.xml", 9, 9, 0); - } - - @Test - public void testCqlDateTimeOperators() { - runTests("cql/CqlDateTimeOperatorsTest.xml", 294, 284, 0); - } - - @Test - public void testCqlErrorsAndMessagingOperators() { - runTests("cql/CqlErrorsAndMessagingOperatorsTest.xml", 4, 4, 0); - } - - @Test - public void testCqlIntervalOperators() { - runTests("cql/CqlIntervalOperatorsTest.xml", 360, 355, 0); - } - - @Test - public void testCqlListOperators() { - runTests("cql/CqlListOperatorsTest.xml", 207, 187, 0); - } - - @Test - public void testCqlLogicalOperators() { - runTests("cql/CqlLogicalOperatorsTest.xml", 39, 39, 0); - } - - @Test - public void testCqlNullologicalOperators() { - runTests("cql/CqlNullologicalOperatorsTest.xml", 22, 22, 0); - } - - @Test - public void testCqlStringOperators() { - runTests("cql/CqlStringOperatorsTest.xml", 81, 80, 0); - } - - @Test - public void testCqlTypeOperators() { - runTests("cql/CqlTypeOperatorsTest.xml", 32, 21, 0); - } - - @Test - public void testCqlTypes() { - runTests("cql/CqlTypesTest.xml", 27, 25, 0); - } - - @Test - public void testCqlValueLiteralsAndSelectors() { - runTests("cql/ValueLiteralsAndSelectors.xml", 66, 57, 0); - } - - private String getStringFromResourceStream(String resourceName) { - java.io.InputStream input = TestFhirPath.class.getResourceAsStream(resourceName); - try (BufferedReader stringReader = new BufferedReader(new InputStreamReader(input))) { - String line = null; - StringBuilder source = new StringBuilder(); - while ((line = stringReader.readLine()) != null) { - source.append(line); - source.append("\n"); - } - return source.toString(); - } catch (IOException e) { - e.printStackTrace(); - } - - return null; - } - - // TODO: Resolve Error: Could not load model information for model FHIR, version - // 3.0.0 because version 1.0.2 is already loaded - //@Test - public void testFhirHelpersStu3() throws UcumException { - String cql = getStringFromResourceStream("stu3/TestFHIRHelpers.cql"); - Library library = translate(cql); - Context context = new Context(library); - context.registerLibraryLoader(getLibraryLoader()); - - Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); - FhirContext fhirContext = FhirContext.forCached(FhirVersionEnum.DSTU3); - RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), - modelResolver, fhirContext.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu3")); - CompositeDataProvider provider = new CompositeDataProvider(modelResolver, retrieveProvider); - // BaseFhirDataProvider provider = new - // FhirDataProviderStu3().setEndpoint("http://fhirtest.uhn.ca/baseDstu3"); - context.registerDataProvider("http://hl7.org/fhir", provider); - - // TODO - fix - context.resolveExpressionRef("TestPeriodToInterval").getExpression().evaluate(context); - // Assert.assertEquals(((DateTime)((Interval) result).getStart()).getPartial(), - // new Partial(DateTime.getFields(6), new int[] {2017, 5, 6, 18, 8, 0})); - // Assert.assertEquals(((DateTime)((Interval) result).getEnd()).getPartial(), - // new Partial(DateTime.getFields(6), new int[] {2017, 5, 6, 19, 8, 0})); - context.resolveExpressionRef("TestToQuantity").getExpression().evaluate(context); - // TODO: ModelInfo bug. Not aware of SimpleQuantity - context.resolveExpressionRef("TestRangeToInterval").getExpression().evaluate(context); - context.resolveExpressionRef("TestToCode").getExpression().evaluate(context); - context.resolveExpressionRef("TestToConcept").getExpression().evaluate(context); - context.resolveExpressionRef("TestToString").getExpression().evaluate(context); - context.resolveExpressionRef("TestRequestStatusToString").getExpression().evaluate(context); - context.resolveExpressionRef("TestToDateTime").getExpression().evaluate(context); - context.resolveExpressionRef("TestToTime").getExpression().evaluate(context); - context.resolveExpressionRef("TestToInteger").getExpression().evaluate(context); - context.resolveExpressionRef("TestToDecimal").getExpression().evaluate(context); - context.resolveExpressionRef("TestToBoolean").getExpression().evaluate(context); - } - - // @Test - public void testFhirHelpersDstu2() throws UcumException { - String cql = getStringFromResourceStream("Dstu2/TestFHIRHelpersDstu2.cql"); - Library library = translate(cql); - Context context = new Context(library); - context.registerLibraryLoader(getLibraryLoader()); - Dstu2FhirModelResolver modelResolver = new Dstu2FhirModelResolver(); - RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider( - new org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver(fhirContext), - modelResolver, FhirContext.forCached(FhirVersionEnum.DSTU2).newRestfulGenericClient("")); - CompositeDataProvider provider = new CompositeDataProvider(modelResolver, retrieveProvider); - //BaseFhirDataProvider provider = new FhirDataProviderDstu2(); - context.registerDataProvider("http://hl7.org/fhir", provider); - - // TODO - millis shouldn't be populated - issue with DateTime.fromJavaDate(Date date) - context.resolveExpressionRef("TestPeriodToInterval").getExpression().evaluate(context); -// Assert.assertEquals(((DateTime)((Interval) result).getStart()).getPartial(), new Partial(DateTime.getFields(7), new int[] {2017, 5, 6, 18, 8, 0, 0})); -// Assert.assertEquals(((DateTime)((Interval) result).getEnd()).getPartial(), new Partial(DateTime.getFields(7), new int[] {2017, 5, 6, 19, 8, 0, 0})); - context.resolveExpressionRef("TestToQuantity").getExpression().evaluate(context); - context.resolveExpressionRef("TestRangeToInterval").getExpression().evaluate(context); - context.resolveExpressionRef("TestToCode").getExpression().evaluate(context); - context.resolveExpressionRef("TestToConcept").getExpression().evaluate(context); - context.resolveExpressionRef("TestToString").getExpression().evaluate(context); - context.resolveExpressionRef("TestRequestStatusToString").getExpression().evaluate(context); - context.resolveExpressionRef("TestToDateTime").getExpression().evaluate(context); - context.resolveExpressionRef("TestToTime").getExpression().evaluate(context); - context.resolveExpressionRef("TestToInteger").getExpression().evaluate(context); - context.resolveExpressionRef("TestToDecimal").getExpression().evaluate(context); - context.resolveExpressionRef("TestToBoolean").getExpression().evaluate(context); - } - - - @Test - public void testDateType() { - // DateType Month is zero-based (11 == December) - DateType birthDate = new DateType(1974, 11, 25); - assertThat(birthDate.getYear(), is(1974)); - assertThat(birthDate.getMonth(), is(11)); - assertThat(birthDate.getDay(), is(25)); - } - - @Test - public void testDate() { - // NOTE: DateType uses default GMT - java.util.Date birthDate = new DateType(1974, 11, 25).getValue(); - GregorianCalendar calendar = new GregorianCalendar(TimeZone.getTimeZone("GMT")); - calendar.setTime(birthDate); - assertThat(calendar.get(Calendar.YEAR), is(1974)); - assertThat(calendar.get(Calendar.MONTH), is(11)); - assertThat(calendar.get(Calendar.DAY_OF_MONTH), is(25)); - } } diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/TestLibraryLoader.java b/engine.fhir/src/test/java/org/hl7/fhirpath/TestLibraryLoader.java index 28c457b27..625f124ce 100644 --- a/engine.fhir/src/test/java/org/hl7/fhirpath/TestLibraryLoader.java +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/TestLibraryLoader.java @@ -9,16 +9,22 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; -import org.cqframework.cql.cql2elm.CqlTranslatorException; +import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.CqlTranslatorOptions; import org.cqframework.cql.cql2elm.LibraryManager; +import org.cqframework.cql.cql2elm.model.CompiledLibrary; import org.cqframework.cql.cql2elm.model.serialization.LibraryWrapper; import org.cqframework.cql.elm.execution.Library; import org.cqframework.cql.elm.execution.VersionedIdentifier; +import org.hl7.cql_annotations.r1.CqlToElmBase; +import org.opencds.cqf.cql.engine.elm.execution.CqlToElmBaseMixIn; import org.opencds.cqf.cql.engine.execution.JsonCqlLibraryReader; import org.opencds.cqf.cql.engine.execution.LibraryLoader; @@ -59,24 +65,28 @@ private Library resolveLibrary(VersionedIdentifier libraryIdentifier) { } private Library loadLibrary(VersionedIdentifier libraryIdentifier) { - List errors = new ArrayList<>(); + List errors = new ArrayList<>(); org.hl7.elm.r1.VersionedIdentifier identifier = new org.hl7.elm.r1.VersionedIdentifier() .withId(libraryIdentifier.getId()) .withSystem(libraryIdentifier.getSystem()) .withVersion(libraryIdentifier.getVersion()); - org.cqframework.cql.cql2elm.model.TranslatedLibrary translatedLibrary = libraryManager.resolveLibrary(identifier, CqlTranslatorOptions.defaultOptions(), errors); + CompiledLibrary compiledLibrary = libraryManager.resolveLibrary(identifier, CqlTranslatorOptions.defaultOptions(), errors); LibraryWrapper wrapper = new LibraryWrapper(); - wrapper.setLibrary(translatedLibrary.getLibrary()); + wrapper.setLibrary(compiledLibrary.getLibrary()); String json; try { - ObjectMapper mapper = new ObjectMapper(); - mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_DEFAULT); - mapper.configure(SerializationFeature.INDENT_OUTPUT, true); - JaxbAnnotationModule annotationModule = new JaxbAnnotationModule(); - mapper.registerModule(annotationModule); + ObjectMapper mapper = JsonMapper.builder() + .defaultMergeable(true) + .enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL) + .defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL)) + .addModule(new JaxbAnnotationModule()) + .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class) + .build(); json = mapper.writeValueAsString(wrapper); } catch (JsonProcessingException e) { diff --git a/engine.fhir/src/test/java/org/hl7/fhirpath/TranslatorHelper.java b/engine.fhir/src/test/java/org/hl7/fhirpath/TranslatorHelper.java new file mode 100644 index 000000000..0c2386386 --- /dev/null +++ b/engine.fhir/src/test/java/org/hl7/fhirpath/TranslatorHelper.java @@ -0,0 +1,70 @@ +package org.hl7.fhirpath; + +import org.cqframework.cql.cql2elm.*; +import org.cqframework.cql.cql2elm.fhir.r4.FhirLibrarySourceProvider; +import org.cqframework.cql.elm.execution.Library; +import org.cqframework.cql.elm.tracking.TrackBack; +import org.fhir.ucum.UcumEssenceService; +import org.fhir.ucum.UcumException; +import org.fhir.ucum.UcumService; +import org.opencds.cqf.cql.engine.execution.JsonCqlLibraryReader; +import org.opencds.cqf.cql.engine.execution.LibraryLoader; + +import java.io.IOException; +import java.io.StringReader; +import java.util.ArrayList; + +public class TranslatorHelper { + private static ModelManager modelManager = new ModelManager(); + private static LibraryManager libraryManager; + + private static LibraryManager getLibraryManager() { + if (libraryManager == null) { + libraryManager = new LibraryManager(modelManager); + libraryManager.getLibrarySourceLoader().clearProviders(); + libraryManager.getLibrarySourceLoader().registerProvider(new TestLibrarySourceProvider()); + libraryManager.getLibrarySourceLoader().registerProvider(new FhirLibrarySourceProvider()); + } + return libraryManager; + } + + private LibraryLoader libraryLoader; + + public LibraryLoader getLibraryLoader() { + if (libraryLoader == null) { + libraryLoader = new TestLibraryLoader(getLibraryManager()); + } + return libraryLoader; + } + + public Library translate(String cql) throws UcumException { + ArrayList options = new ArrayList<>(); + options.add(CqlTranslatorOptions.Options.EnableDateRangeOptimization); + UcumService ucumService = new UcumEssenceService( + UcumEssenceService.class.getResourceAsStream("/ucum-essence.xml")); + + CqlTranslator translator = CqlTranslator.fromText(cql, modelManager, getLibraryManager(), ucumService, + options.toArray(new CqlTranslatorOptions.Options[options.size()])); + if (translator.getErrors().size() > 0) { + ArrayList errors = new ArrayList<>(); + for (CqlCompilerException error : translator.getErrors()) { + TrackBack tb = error.getLocator(); + String lines = tb == null ? "[n/a]" + : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), + tb.getEndChar()); + errors.add(lines + error.getMessage()); + } + throw new IllegalArgumentException(errors.toString()); + } + + String json = translator.toJson(); + + try { + return JsonCqlLibraryReader.read(new StringReader(json)); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + return null; + } +} diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java index f41935350..6a926c88f 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/FhirExecutionTestBase.java @@ -1,18 +1,10 @@ package org.opencds.cqf.cql.engine.fhir.data; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; - -import java.io.*; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.JAXBException; - +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; import org.cqframework.cql.cql2elm.*; -import org.cqframework.cql.cql2elm.model.TranslatedLibrary; +import org.cqframework.cql.cql2elm.fhir.r4.FhirLibrarySourceProvider; +import org.cqframework.cql.cql2elm.model.CompiledLibrary; import org.cqframework.cql.elm.execution.Library; import org.cqframework.cql.elm.tracking.TrackBack; import org.fhir.ucum.UcumEssenceService; @@ -20,16 +12,23 @@ import org.fhir.ucum.UcumService; import org.opencds.cqf.cql.engine.data.CompositeDataProvider; import org.opencds.cqf.cql.engine.execution.JsonCqlLibraryReader; -import org.opencds.cqf.cql.engine.fhir.model.Dstu2FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.*; import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; -import ca.uhn.fhir.context.FhirContext; -import ca.uhn.fhir.context.FhirVersionEnum; +import javax.xml.bind.JAXBException; +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Map; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; public abstract class FhirExecutionTestBase { static Map libraries = new HashMap<>(); @@ -52,20 +51,20 @@ public abstract class FhirExecutionTestBase { @BeforeClass public void setup() { - dstu2ModelResolver = new Dstu2FhirModelResolver(); FhirContext dstu2Context = FhirContext.forCached(FhirVersionEnum.DSTU2); + dstu2ModelResolver = new CachedDstu2FhirModelResolver(); dstu2RetrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(dstu2Context), dstu2ModelResolver, dstu2Context.newRestfulGenericClient("http://fhirtest.uhn.ca/baseDstu2")); dstu2Provider = new CompositeDataProvider(dstu2ModelResolver, dstu2RetrieveProvider); - dstu3ModelResolver = new Dstu3FhirModelResolver(); FhirContext dstu3Context = FhirContext.forCached(FhirVersionEnum.DSTU3); + dstu3ModelResolver = new CachedDstu3FhirModelResolver(); dstu3RetrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(dstu3Context), dstu3ModelResolver, dstu3Context.newRestfulGenericClient("http://measure.eval.kanvix.com/cqf-ruler/baseDstu3")); dstu3Provider = new CompositeDataProvider(dstu3ModelResolver, dstu3RetrieveProvider); - r4ModelResolver = new R4FhirModelResolver(); FhirContext r4Context = FhirContext.forCached(FhirVersionEnum.R4); + r4ModelResolver = new CachedR4FhirModelResolver(); r4RetrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(r4Context), r4ModelResolver, r4Context.newRestfulGenericClient("http://measure.eval.kanvix.com/cqf-ruler/baseDstu4")); r4Provider = new CompositeDataProvider(r4ModelResolver, r4RetrieveProvider); @@ -84,15 +83,15 @@ public void beforeEachTestMethod() throws JAXBException, IOException, UcumExcept try { File cqlFile = new File(URLDecoder.decode(this.getClass().getResource("fhir/" + fileName + ".cql").getFile(), "UTF-8")); - ArrayList options = new ArrayList<>(); - options.add(CqlTranslator.Options.EnableDateRangeOptimization); + ArrayList options = new ArrayList<>(); + options.add(CqlTranslatorOptions.Options.EnableDateRangeOptimization); - CqlTranslator translator = CqlTranslator.fromFile(cqlFile, modelManager, libraryManager, ucumService, options.toArray(new CqlTranslator.Options[options.size()])); + CqlTranslator translator = CqlTranslator.fromFile(cqlFile, modelManager, libraryManager, ucumService, options.toArray(new CqlTranslatorOptions.Options[options.size()])); if (translator.getErrors().size() > 0) { System.err.println("Translation failed due to errors:"); ArrayList errors = new ArrayList<>(); - for (CqlTranslatorException error : translator.getErrors()) { + for (CqlCompilerException error : translator.getErrors()) { TrackBack tb = error.getLocator(); String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); @@ -104,8 +103,8 @@ public void beforeEachTestMethod() throws JAXBException, IOException, UcumExcept assertThat(translator.getErrors().size(), is(0)); - for (Map.Entry entry : libraryManager.getTranslatedLibraries().entrySet()) { - String jsonContent = CqlTranslator.convertToJxson(entry.getValue().getLibrary()); + for (Map.Entry entry : libraryManager.getCompiledLibraries().entrySet()) { + String jsonContent = CqlTranslator.convertToJson(entry.getValue().getLibrary()); StringReader sr = new StringReader(jsonContent); libraries.put(entry.getKey(), JsonCqlLibraryReader.read(sr)); if (entry.getKey().equals(fileName)) { @@ -114,7 +113,7 @@ public void beforeEachTestMethod() throws JAXBException, IOException, UcumExcept } if (library == null) { - library = JsonCqlLibraryReader.read(new StringReader(translator.toJxson())); + library = JsonCqlLibraryReader.read(new StringReader(translator.toJson())); libraries.put(fileName, library); } } catch (IOException e) { diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/TestFhirDataProviderDstu3.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/TestFhirDataProviderDstu3.java index 6799e2104..32f2809e6 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/TestFhirDataProviderDstu3.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/data/TestFhirDataProviderDstu3.java @@ -10,6 +10,7 @@ import org.hl7.fhir.dstu3.model.Patient; import org.opencds.cqf.cql.engine.data.CompositeDataProvider; import org.opencds.cqf.cql.engine.execution.Context; +import org.opencds.cqf.cql.engine.fhir.model.CachedDstu3FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.retrieve.FhirBundleCursor; import org.opencds.cqf.cql.engine.fhir.retrieve.RestFhirRetrieveProvider; @@ -35,7 +36,7 @@ public void testFhirClient() { // @Test public void testDataProviderRetrieve() { - Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); + Dstu3FhirModelResolver modelResolver = new CachedDstu3FhirModelResolver(); RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), modelResolver, fhirContext.newRestfulGenericClient("http://measure.eval.kanvix.com/cqf-ruler/baseDstu3")); @@ -51,7 +52,7 @@ public void testDataProviderRetrieve() { // @Test public void testPatientRetrieve() { - Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); + Dstu3FhirModelResolver modelResolver = new CachedDstu3FhirModelResolver(); RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), modelResolver, fhirContext.newRestfulGenericClient("http://measure.eval.kanvix.com/cqf-ruler/baseDstu3")); @@ -140,7 +141,7 @@ public void testFhirObjectEquivalent() // @Test public void testList() { - Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); + Dstu3FhirModelResolver modelResolver = new CachedDstu3FhirModelResolver(); RestFhirRetrieveProvider retrieveProvider = new RestFhirRetrieveProvider(new SearchParameterResolver(fhirContext), modelResolver, fhirContext.newRestfulGenericClient("http://fhir.hl7.de:8080/baseDstu3")); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu2FhirModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu2FhirModelResolver.java new file mode 100644 index 000000000..f0c521ed1 --- /dev/null +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu2FhirModelResolver.java @@ -0,0 +1,10 @@ +package org.opencds.cqf.cql.engine.fhir.model; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; + +public class CachedDstu2FhirModelResolver extends Dstu2FhirModelResolver { + public CachedDstu2FhirModelResolver() { + super(FhirContext.forCached(FhirVersionEnum.DSTU2)); + } +} diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu3FhirModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu3FhirModelResolver.java new file mode 100644 index 000000000..8a04d7fb7 --- /dev/null +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedDstu3FhirModelResolver.java @@ -0,0 +1,10 @@ +package org.opencds.cqf.cql.engine.fhir.model; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; + +public class CachedDstu3FhirModelResolver extends Dstu3FhirModelResolver { + public CachedDstu3FhirModelResolver() { + super(FhirContext.forCached(FhirVersionEnum.DSTU3)); + } +} diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedR4FhirModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedR4FhirModelResolver.java new file mode 100644 index 000000000..db485b9f4 --- /dev/null +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/CachedR4FhirModelResolver.java @@ -0,0 +1,10 @@ +package org.opencds.cqf.cql.engine.fhir.model; + +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; + +public class CachedR4FhirModelResolver extends R4FhirModelResolver { + public CachedR4FhirModelResolver() { + super(FhirContext.forCached(FhirVersionEnum.R4)); + } +} diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu2ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu2ModelResolver.java index 72e9fe32b..f506b0639 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu2ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu2ModelResolver.java @@ -8,11 +8,15 @@ import java.util.ArrayList; import java.util.List; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; + import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.cql2elm.model.Model; import org.hl7.elm.r1.VersionedIdentifier; import org.hl7.elm_modelinfo.r1.ClassInfo; import org.hl7.elm_modelinfo.r1.TypeInfo; + import org.hl7.fhir.dstu2.model.EnumFactory; import org.hl7.fhir.dstu2.model.Enumeration; import org.hl7.fhir.dstu2.model.Enumerations.AdministrativeGender; @@ -59,7 +63,7 @@ public class TestDstu2ModelResolver { @Test(expectedExceptions = UnknownType.class) public void resolverThrowsExceptionForUnknownType() { - ModelResolver resolver = new Dstu2FhirModelResolver(); + ModelResolver resolver = new Dstu2FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU2)); resolver.resolveType("ImpossibleTypeThatDoesntExistAndShouldBlowUp"); } @@ -91,7 +95,7 @@ public void resolveModelInfoTests() { @Test public void resolveTypeTests() { - ModelResolver resolver = new Dstu2FhirModelResolver(); + ModelResolver resolver = new Dstu2FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU2)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -125,7 +129,7 @@ public void resolveTypeTests() { @Test public void createInstanceTests() { - ModelResolver resolver = new Dstu2FhirModelResolver(); + ModelResolver resolver = new Dstu2FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU2)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -179,7 +183,7 @@ public void createInstanceTests() { @Test public void contextPathTests() { - ModelResolver resolver = new Dstu2FhirModelResolver(); + ModelResolver resolver = new Dstu2FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU2)); String path = (String) resolver.getContextPath("Patient", "Patient"); assertNotNull(path); @@ -225,7 +229,7 @@ public void contextPathTests() { // between the dstu2 and hl7org dstu2 objects. // @Test public void resolveMissingPropertyReturnsNull() { - ModelResolver resolver = new Dstu2FhirModelResolver(); + ModelResolver resolver = new Dstu2FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU2)); Patient p = new Patient(); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java index c59419dee..bb3434e32 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestDstu3ModelResolver.java @@ -7,6 +7,8 @@ import java.util.ArrayList; import java.util.List; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.cql2elm.model.Model; import org.hl7.elm.r1.VersionedIdentifier; @@ -63,14 +65,14 @@ public class TestDstu3ModelResolver { @Test(expectedExceptions = UnknownType.class) public void resolverThrowsExceptionForUnknownType() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); resolver.resolveType("ImpossibleTypeThatDoesntExistAndShouldBlowUp"); } @Test // This tests all the top-level types HAPI knows about. public void resolveTypeTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -105,7 +107,7 @@ public void resolveTypeTests() { @Test // This tests all the types that are present in the ModelInfo. public void resolveModelInfoTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); ModelManager mm = new ModelManager(); Model m = mm.resolveModel(new VersionedIdentifier().withId("FHIR").withVersion("3.0.0")); @@ -136,7 +138,7 @@ public void resolveModelInfoTests() { // on the FhirContext or generalized logic, or fixed-up ModelInfos @Test public void modelInfoSpecialCaseTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); // This tests resolution of inner classes. They aren't registered directly. resolver.resolveType("TestScriptRequestMethodCode"); @@ -158,7 +160,7 @@ public void modelInfoSpecialCaseTests() { @Test public void createInstanceTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -212,7 +214,7 @@ public void createInstanceTests() { @Test public void contextPathTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); String path = (String) resolver.getContextPath("Patient", "Patient"); assertNotNull(path); @@ -255,7 +257,7 @@ public void contextPathTests() { @Test public void resolveMissingPropertyReturnsNull() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); Patient p = new Patient(); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java index 20db16962..1e384a1cc 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/model/TestR4ModelResolver.java @@ -11,6 +11,8 @@ import java.util.GregorianCalendar; import java.util.List; +import ca.uhn.fhir.context.FhirContext; +import ca.uhn.fhir.context.FhirVersionEnum; import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.cql2elm.model.Model; import org.hl7.elm.r1.VersionedIdentifier; @@ -81,13 +83,13 @@ public class TestR4ModelResolver { @Test(expectedExceptions = UnknownType.class) public void resolverThrowsExceptionForUnknownType() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); resolver.resolveType("ImpossibleTypeThatDoesntExistAndShouldBlowUp"); } @Test public void resolveTypeTests() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -121,7 +123,7 @@ public void resolveTypeTests() { @Test public void modelInfoSpecialCaseTests() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); // This tests resolution of inner classes. They aren't registered directly. resolver.resolveType("TestScriptRequestMethodCode"); @@ -162,9 +164,9 @@ public void modelInfoSpecialCaseTests() { @Test public void modelInfo400Tests() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); ModelManager mm = new ModelManager(); - Model m = mm.resolveModel(new VersionedIdentifier().withId("FHIR").withVersion("4.0.0")); + Model m = mm.resolveModel(new VersionedIdentifier().withId("FHIR").withVersion("4.0.1")); List typeInfos = m.getModelInfo().getTypeInfo(); @@ -196,7 +198,7 @@ public void modelInfo400Tests() { @Test public void modelInfo401Tests() throws Exception { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); ModelManager mm = new ModelManager(); Model m = mm.resolveModel(new VersionedIdentifier().withId("FHIR").withVersion("4.0.1")); @@ -240,7 +242,7 @@ public void modelInfo401Tests() throws Exception { @Test public void createInstanceTests() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); for (DataType type : DataType.values()) { // These are abstract types that should never be resolved directly. @@ -292,7 +294,7 @@ public void createInstanceTests() { @Test public void contextPathTests() { - ModelResolver resolver = new Dstu3FhirModelResolver(); + ModelResolver resolver = new Dstu3FhirModelResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); String path = (String)resolver.getContextPath("Patient", "Patient"); assertNotNull(path); @@ -338,7 +340,7 @@ public void contextPathTests() { @Test public void resolveMissingPropertyReturnsNull() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); Patient p = new Patient(); @@ -348,7 +350,7 @@ public void resolveMissingPropertyReturnsNull() { @Test public void resolveIdPropertyReturnsString() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); Patient p = new Patient(); p.setId("5"); @@ -366,7 +368,7 @@ public void resolveIdPropertyReturnsString() { @Test public void resolveDateTimeProviderReturnsDate() { - ModelResolver resolver = new R4FhirModelResolver(); + ModelResolver resolver = new R4FhirModelResolver(FhirContext.forCached(FhirVersionEnum.R4)); VisionPrescription vp = new VisionPrescription(); Date time = new GregorianCalendar(1999, 3, 31).getTime(); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestDstu3FhirQueryGenerator.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestDstu3FhirQueryGenerator.java index 196a91976..6b3732793 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestDstu3FhirQueryGenerator.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestDstu3FhirQueryGenerator.java @@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter; import java.util.*; +import ca.uhn.fhir.context.FhirVersionEnum; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.dstu3.model.Bundle; import org.hl7.fhir.dstu3.model.DataRequirement; @@ -16,6 +17,7 @@ import org.hl7.fhir.dstu3.model.ValueSet; import org.opencds.cqf.cql.engine.fhir.Dstu3FhirTest; import org.opencds.cqf.cql.engine.fhir.exception.FhirVersionMisMatchException; +import org.opencds.cqf.cql.engine.fhir.model.CachedDstu3FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; import org.opencds.cqf.cql.engine.fhir.terminology.Dstu3FhirTerminologyProvider; @@ -44,9 +46,9 @@ public void setUpBeforeClass() { @BeforeMethod public void setUp() throws FhirVersionMisMatchException { - SearchParameterResolver searchParameterResolver = new SearchParameterResolver(FhirContext.forDstu3()); + SearchParameterResolver searchParameterResolver = new SearchParameterResolver(FhirContext.forCached(FhirVersionEnum.DSTU3)); TerminologyProvider terminologyProvider = new Dstu3FhirTerminologyProvider(CLIENT); - Dstu3FhirModelResolver modelResolver = new Dstu3FhirModelResolver(); + Dstu3FhirModelResolver modelResolver = new CachedDstu3FhirModelResolver(); this.generator = new Dstu3FhirQueryGenerator(searchParameterResolver, terminologyProvider, modelResolver); this.evaluationOffsetDateTime = OffsetDateTime.of(2018, 11, 19, 9, 0, 0, 000, ZoneOffset.ofHours(-10)); this.evaluationDateTime = new DateTime(evaluationOffsetDateTime); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestR4FhirQueryGenerator.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestR4FhirQueryGenerator.java index a8568bc7e..204428e65 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestR4FhirQueryGenerator.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestR4FhirQueryGenerator.java @@ -8,6 +8,7 @@ import java.time.format.DateTimeFormatter; import java.util.*; +import ca.uhn.fhir.context.FhirVersionEnum; import org.apache.commons.lang3.StringUtils; import org.hl7.fhir.r4.model.Bundle; import org.hl7.fhir.r4.model.DataRequirement; @@ -16,6 +17,7 @@ import org.hl7.fhir.r4.model.ValueSet; import org.opencds.cqf.cql.engine.fhir.R4FhirTest; import org.opencds.cqf.cql.engine.fhir.exception.FhirVersionMisMatchException; +import org.opencds.cqf.cql.engine.fhir.model.CachedR4FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; import org.opencds.cqf.cql.engine.fhir.terminology.R4FhirTerminologyProvider; @@ -44,9 +46,9 @@ public void setUpBeforeClass() { @BeforeMethod public void setUp() throws FhirVersionMisMatchException { - SearchParameterResolver searchParameterResolver = new SearchParameterResolver(FhirContext.forR4()); + SearchParameterResolver searchParameterResolver = new SearchParameterResolver(FhirContext.forCached(FhirVersionEnum.R4)); TerminologyProvider terminologyProvider = new R4FhirTerminologyProvider(CLIENT); - R4FhirModelResolver modelResolver = new R4FhirModelResolver(); + R4FhirModelResolver modelResolver = new CachedR4FhirModelResolver(); this.generator = new R4FhirQueryGenerator(searchParameterResolver, terminologyProvider, modelResolver); OffsetDateTime evaluationDateTime = OffsetDateTime.of(2018, 11, 19, 9, 0, 0, 000, ZoneOffset.ofHours(-7)); this.evaluationOffsetDateTime = OffsetDateTime.of(2018, 11, 19, 9, 0, 0, 000, ZoneOffset.ofHours(-10)); diff --git a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestRestFhirRetrieveProvider.java b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestRestFhirRetrieveProvider.java index b995fb68a..56598dfa2 100644 --- a/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestRestFhirRetrieveProvider.java +++ b/engine.fhir/src/test/java/org/opencds/cqf/cql/engine/fhir/retrieve/TestRestFhirRetrieveProvider.java @@ -4,19 +4,18 @@ import static org.testng.Assert.assertEquals; import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching; +import static org.testng.Assert.assertNull; import java.time.OffsetDateTime; import java.time.ZoneOffset; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import ca.uhn.fhir.context.FhirVersionEnum; import org.hl7.fhir.r4.model.Patient; import org.opencds.cqf.cql.engine.fhir.R4FhirTest; import org.opencds.cqf.cql.engine.fhir.exception.FhirVersionMisMatchException; -import org.opencds.cqf.cql.engine.fhir.model.Dstu3FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.FhirModelResolver; -import org.opencds.cqf.cql.engine.fhir.model.R4FhirModelResolver; +import org.opencds.cqf.cql.engine.fhir.model.*; import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterMap; import org.opencds.cqf.cql.engine.fhir.searchparam.SearchParameterResolver; import org.opencds.cqf.cql.engine.runtime.Code; @@ -34,7 +33,7 @@ public class TestRestFhirRetrieveProvider extends R4FhirTest { static IGenericClient CLIENT; RestFhirRetrieveProvider provider; - FhirModelResolver modelResolver; + FhirModelResolver modelResolver; @BeforeClass public void setUpBeforeClass() { @@ -48,11 +47,11 @@ public void setUp() { this.provider = new RestFhirRetrieveProvider(RESOLVER, modelResolver, CLIENT); } - private FhirModelResolver getModelResolver(FhirVersionEnum fhirVersionEnum) { + private FhirModelResolver getModelResolver(FhirVersionEnum fhirVersionEnum) { if(fhirVersionEnum.equals(FhirVersionEnum.DSTU3)) { - return new Dstu3FhirModelResolver(); + return new CachedDstu3FhirModelResolver(); } else if(fhirVersionEnum.equals(FhirVersionEnum.R4)) { - return new R4FhirModelResolver(); + return new CachedR4FhirModelResolver(); } return null; } @@ -64,7 +63,7 @@ public void noUserSpecifiedPageSizeUsesDefault() throws FhirVersionMisMatchExcep provider.searchParameterResolver, provider.getTerminologyProvider()); SearchParameterMap map = fhirQueryGenerator.getBaseMap(null, null, null, null); - assertEquals(map.getCount(), null); + assertNull(map.getCount()); } @Test @@ -81,7 +80,7 @@ public void userSpecifiedPageSizeIsUsed() throws FhirVersionMisMatchException { @Test public void userSpecifiedPageSizeIsUsedWhenCodeBasedQuery() { Code code = new Code().withSystem("http://mysystem.com").withCode("mycode"); - List codes = Arrays.asList( code ); + List codes = Collections.singletonList(code); mockFhirSearch("/Condition?code=" + escapeUrlParam(code.getSystem() + "|" + code.getCode()) + "&subject=" + escapeUrlParam("Patient/123") + "&_count=500"); @@ -102,7 +101,7 @@ public void userSpecifiedPageSizeIsUsedWhenValueSetQuery() { @Test public void userSpecifiedPageSizeIsUsedWhenDateQuery() { - /** + /* * As best as I can tell, the date range optimized queries are * broken right now. See https://github.com/DBCG/cql_engine/issues/467. */ @@ -136,7 +135,7 @@ public void userSpecifiedPageSizeNotUsedWhenIDQuery() { @Test public void noUserSpecifiedPageSizeSpecifiedNoCountInURL() { Code code = new Code().withSystem("http://mysystem.com").withCode("mycode"); - List codes = Arrays.asList( code ); + List codes = Collections.singletonList(code); mockFhirSearch("/Condition?code=" + escapeUrlParam(code.getSystem() + "|" + code.getCode()) + "&subject=" + escapeUrlParam("Patient/123")); diff --git a/engine.fhir/src/test/resources/org/hl7/fhirpath/stu3/schema/xml.xsd b/engine.fhir/src/test/resources/org/hl7/fhirpath/stu3/schema/xml.xsd new file mode 100644 index 000000000..d662b4236 --- /dev/null +++ b/engine.fhir/src/test/resources/org/hl7/fhirpath/stu3/schema/xml.xsd @@ -0,0 +1,117 @@ + + + + + + + See http://www.w3.org/XML/1998/namespace.html and + http://www.w3.org/TR/REC-xml for information about this namespace. + + This schema document describes the XML namespace, in a form + suitable for import by other schema documents. + + Note that local names in this namespace are intended to be defined + only by the World Wide Web Consortium or its subgroups. The + following names are currently defined in this namespace and should + not be used with conflicting semantics by any Working Group, + specification, or document instance: + + base (as an attribute name): denotes an attribute whose value + provides a URI to be used as the base for interpreting any + relative URIs in the scope of the element on which it + appears; its value is inherited. This name is reserved + by virtue of its definition in the XML Base specification. + + lang (as an attribute name): denotes an attribute whose value + is a language code for the natural language of the content of + any element; its value is inherited. This name is reserved + by virtue of its definition in the XML specification. + + space (as an attribute name): denotes an attribute whose + value is a keyword indicating what whitespace processing + discipline is intended for the content of the element; its + value is inherited. This name is reserved by virtue of its + definition in the XML specification. + + Father (in any context at all): denotes Jon Bosak, the chair of + the original XML Working Group. This name is reserved by + the following decision of the W3C XML Plenary and + XML Coordination groups: + + In appreciation for his vision, leadership and dedication + the W3C XML Plenary on this 10th day of February, 2000 + reserves for Jon Bosak in perpetuity the XML name + xml:Father + + + + + This schema defines attributes and an attribute group + suitable for use by + schemas wishing to allow xml:base, xml:lang or xml:space attributes + on elements they define. + + To enable this, such a schema must import this schema + for the XML namespace, e.g. as follows: + <schema . . .> + . . . + <import namespace="http://www.w3.org/XML/1998/namespace" + schemaLocation="http://www.w3.org/2001/03/xml.xsd"/> + + Subsequently, qualified reference to any of the attributes + or the group defined below will have the desired effect, e.g. + + <type . . .> + . . . + <attributeGroup ref="xml:specialAttrs"/> + + will define a type which will schema-validate an instance + element with any of those attributes + + + + In keeping with the XML Schema WG's standard versioning + policy, this schema document will persist at + http://www.w3.org/2001/03/xml.xsd. + At the date of issue it can also be found at + http://www.w3.org/2001/xml.xsd. + The schema document at that URI may however change in the future, + in order to remain compatible with the latest version of XML Schema + itself. In other words, if the XML Schema namespace changes, the version + of this document at + http://www.w3.org/2001/xml.xsd will change + accordingly; the version at + http://www.w3.org/2001/03/xml.xsd will not change. + + + + + + In due course, we should install the relevant ISO 2- and 3-letter + codes as the enumerated possible values . . . + + + + + + + + + + + + + + + See http://www.w3.org/TR/xmlbase/ for + information about this attribute. + + + + + + + + + + diff --git a/engine.jaxb/pom.xml b/engine.jaxb/pom.xml index 277940596..c4fac416f 100644 --- a/engine.jaxb/pom.xml +++ b/engine.jaxb/pom.xml @@ -9,7 +9,6 @@ 1.5.10-SNAPSHOT - org.opencds.cqf.cql engine.jaxb 1.5.10-SNAPSHOT jar @@ -24,27 +23,37 @@ engine 1.5.10-SNAPSHOT + + - org.jvnet.jaxb2_commons - jaxb2-basics - 0.12.0 + xpp3 + xpp3 + test + + + xpp3 + xpp3_xpath + test org.eclipse.persistence org.eclipse.persistence.moxy + test - org.fhir - ucum + info.cqframework + cql-to-elm + test - - xpp3 - xpp3 + info.cqframework + model-jaxb + test - xpp3 - xpp3_xpath + info.cqframework + elm-jaxb + test @@ -62,7 +71,7 @@ org.apache.maven.surefire surefire-testng - 2.21.0 + ${surefire.version} diff --git a/engine.jaxb/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ObjectFactoryEx.java b/engine.jaxb/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ObjectFactoryEx.java index 3ec57fb4e..06809baf2 100644 --- a/engine.jaxb/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ObjectFactoryEx.java +++ b/engine.jaxb/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ObjectFactoryEx.java @@ -8,7 +8,7 @@ import org.cqframework.cql.elm.execution.*; @XmlRegistry -public class ObjectFactoryEx extends org.cqframework.cql.elm.execution.ObjectFactory { +public class ObjectFactoryEx extends ObjectFactory { @Override public Abs createAbs() { return new AbsEvaluator(); } @@ -568,4 +568,17 @@ public JAXBElement createLibrary(Library value) { return new JAXBElement(new QName("urn:hl7-org:elm:r1", "library"), Library.class, null, value); } + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Narrative }{@code >} + * + * @param value + * Java instance representing xml element's value. + * @return + * the new instance of {@link JAXBElement }{@code <}{@link Narrative }{@code >} + */ + @XmlElementDecl(namespace = "urn:hl7-org:cql-annotations:r1", name = "s", scope = Narrative.class) + public JAXBElement createNarrativeS(Narrative value) { + return new JAXBElement(new QName("urn:hl7-org:cql-annotations:r1", "s"), Narrative.class, Narrative.class, value); + } + } diff --git a/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ANCFHIRTests.java b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ANCFHIRTests.java new file mode 100644 index 000000000..132c6d94f --- /dev/null +++ b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ANCFHIRTests.java @@ -0,0 +1,42 @@ +package org.opencds.cqf.cql.engine.execution; + +import org.cqframework.cql.elm.execution.Library; +import org.opencds.cqf.cql.engine.elm.execution.ExpressionDefEvaluator; +import org.opencds.cqf.cql.engine.elm.execution.RetrieveEvaluator; +import org.opencds.cqf.cql.engine.elm.execution.SingletonFromEvaluator; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.io.IOException; +import java.io.InputStreamReader; + +public class ANCFHIRTests { + @Test + public void testJsonLibraryLoad() { + try { + Library library = JsonCqlLibraryReader.read(new InputStreamReader(ANCFHIRTests.class.getResourceAsStream("ANCFHIRDummy.json"))); + Assert.assertTrue(library != null); + Assert.assertTrue(library.getStatements() != null); + Assert.assertTrue(library.getStatements().getDef() != null); + Assert.assertTrue(library.getStatements().getDef().size() >= 2); + Assert.assertTrue(library.getStatements().getDef().get(0) instanceof ExpressionDefEvaluator); + Assert.assertTrue(library.getStatements().getDef().get(0).getExpression() instanceof SingletonFromEvaluator); + Assert.assertTrue(((SingletonFromEvaluator)library.getStatements().getDef().get(0).getExpression()).getOperand() instanceof RetrieveEvaluator); + Assert.assertTrue(library.getStatements().getDef().get(1) instanceof ExpressionDefEvaluator); + Assert.assertTrue(library.getStatements().getDef().get(1).getExpression() instanceof RetrieveEvaluator); + } + catch (IOException e) { + throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); + } + } + + @Test + public void testJsonTerminologyLibraryLoad() { + try { + Library library = JsonCqlLibraryReader.read(new InputStreamReader(ANCFHIRTests.class.getResourceAsStream("ANCFHIRTerminologyDummy.json"))); + Assert.assertTrue(library != null); + } catch (IOException e) { + throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); + } + } +} diff --git a/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/CMS53Tests.java b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/CMS53Tests.java new file mode 100644 index 000000000..cd224ad02 --- /dev/null +++ b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/CMS53Tests.java @@ -0,0 +1,18 @@ +package org.opencds.cqf.cql.engine.execution; + +import org.testng.annotations.Test; + +import javax.xml.bind.JAXBException; +import java.io.IOException; + +public class CMS53Tests { + @Test + public void testLibraryLoadXML() { + try { + CqlLibraryReader.read(CMS53Tests.class.getResourceAsStream("CMS53Draft/PrimaryPCIReceivedWithin90MinutesofHospitalArrival-7.0.001.xml")); + } catch (IOException | JAXBException e) { + throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); + } + } + +} diff --git a/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmRegressionTests.java b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmRegressionTests.java new file mode 100644 index 000000000..8b6f59efa --- /dev/null +++ b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmRegressionTests.java @@ -0,0 +1,97 @@ +package org.opencds.cqf.cql.engine.execution; + +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.JAXBException; + +import org.cqframework.cql.elm.execution.Library; +import org.testng.Assert; +import org.testng.ITest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; + +public class ElmRegressionTests implements ITest { + private final String path; + private final String fileName; + + @Factory(dataProvider = "dataMethod") + public ElmRegressionTests(String path, String fileName) { + this.path = path; + this.fileName = fileName; + } + + @DataProvider + public static Object[][] dataMethod() throws URISyntaxException { + List filesToTest = new ArrayList<>(); + filesToTest.addAll(collectTestFilesFrom("qdm")); + filesToTest.addAll(collectTestFilesFrom("fhir")); + filesToTest.addAll(collectTestFilesFrom("qdm2020")); + return filesToTest.toArray(new String[filesToTest.size()][]); + } + + public static List collectTestFilesFrom(String directoryName) throws URISyntaxException { + List filesToTest = new ArrayList<>(); + URL dirURL = ElmRegressionTests.class.getResource(String.format("ElmTests/Regression/%s/", directoryName)); + File file = new File(dirURL.toURI()); + for (String fileName : file.list()) { + if (fileName.endsWith(".xml")) { + String name = fileName.substring(0, fileName.length() - 4); + filesToTest.add(new String[]{ file.getAbsolutePath(), name }); + } + } + return filesToTest; + } + + public String getPathName() { + return path.substring(path.lastIndexOf("/")+1).toUpperCase(); + } + + public String getTestName() { + return "test" + getPathName() + fileName; + } + + @Test + private void testElmDeserialization() throws IOException, JAXBException { + Library xmlLibrary = null; + try { + xmlLibrary = CqlLibraryReader.read(new FileReader(path + "/" + fileName + ".xml")); + } + catch (Exception e) { + throw new IllegalArgumentException(String.format("Errors occurred reading ELM from xml %s: %s", getPathName() + fileName, e.getMessage())); + } + + Library jsonLibrary = null; + try { + jsonLibrary = JsonCqlLibraryReader.read(new FileReader(path + "/" + fileName + ".json")); + } + catch (Exception e) { + throw new IllegalArgumentException(String.format("Errors occurred reading ELM from json %s: %s", getPathName() + fileName, e.getMessage())); + } + + if (xmlLibrary != null && jsonLibrary != null) { + Assert.assertTrue(equivalent(xmlLibrary, jsonLibrary)); + } + } + + private static boolean equivalent(Library left, Library right) { + if (left == null && right == null) { + return true; + } + + if (left != null) { + return left.getIdentifier().equals(right.getIdentifier()); + } + + // TODO: validate ELM equivalence... big job... + // Simplest would be to introduce on Executable... + + return false; + } +} diff --git a/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmTests.java b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmTests.java index 5449ebaaa..df10f85e1 100644 --- a/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmTests.java +++ b/engine.jaxb/src/test/java/org/opencds/cqf/cql/engine/execution/ElmTests.java @@ -1,143 +1,25 @@ package org.opencds.cqf.cql.engine.execution; -import java.io.File; -import java.io.FileReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.List; - -import javax.xml.bind.JAXBException; - import org.cqframework.cql.elm.execution.Library; -import org.opencds.cqf.cql.engine.elm.execution.ExpressionDefEvaluator; -import org.opencds.cqf.cql.engine.elm.execution.RetrieveEvaluator; -import org.opencds.cqf.cql.engine.elm.execution.SingletonFromEvaluator; import org.testng.Assert; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class ElmTests { - - private Library library; +import javax.xml.bind.JAXBException; +import java.io.IOException; +import java.util.List; - @BeforeMethod - public void setup() { - try { - this.library = CqlLibraryReader.read(ElmTests.class.getResourceAsStream("ElmTests.xml")); - } catch (IOException | JAXBException e) { - throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); - } - } +public class ElmTests { /** * {@link org.opencds.cqf.cql.engine.elm.execution.FilterEvaluator#evaluate(Context)} */ @Test - public void FilterTest() { + public void filterTest() throws JAXBException, IOException { + Library library = CqlLibraryReader.read(ElmTests.class.getResourceAsStream("ElmTests.xml")); Context context = new Context(library); Object result = context.resolveExpressionRef("TestFilter").getExpression().evaluate(context); Assert.assertTrue(((List) result).size() == 2); } - @Test - public void TestLibraryLoad() { - try { - CqlLibraryReader.read(ElmTests.class.getResourceAsStream("CMS53Draft/PrimaryPCIReceivedWithin90MinutesofHospitalArrival-7.0.001.xml")); - } catch (IOException | JAXBException e) { - throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); - } - } - - @Test - public void TestJsonLibraryLoad() { - try { - Library library = JsonCqlLibraryReader.read(new InputStreamReader(ElmTests.class.getResourceAsStream("ANCFHIRDummy.json"))); - Assert.assertTrue(library != null); - Assert.assertTrue(library.getStatements() != null); - Assert.assertTrue(library.getStatements().getDef() != null); - Assert.assertTrue(library.getStatements().getDef().size() >= 2); - Assert.assertTrue(library.getStatements().getDef().get(0) instanceof ExpressionDefEvaluator); - Assert.assertTrue(library.getStatements().getDef().get(0).getExpression() instanceof SingletonFromEvaluator); - Assert.assertTrue(((SingletonFromEvaluator)library.getStatements().getDef().get(0).getExpression()).getOperand() instanceof RetrieveEvaluator); - Assert.assertTrue(library.getStatements().getDef().get(1) instanceof ExpressionDefEvaluator); - Assert.assertTrue(library.getStatements().getDef().get(1).getExpression() instanceof RetrieveEvaluator); - } - catch (IOException e) { - throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); - } - } - - @Test - public void TestJsonTerminologyLibraryLoad() { - try { - Library library = JsonCqlLibraryReader.read(new InputStreamReader(ElmTests.class.getResourceAsStream("ANCFHIRTerminologyDummy.json"))); - Assert.assertTrue(library != null); - } catch (IOException e) { - throw new IllegalArgumentException("Error reading ELM: " + e.getMessage()); - } - } - - private void testElmDeserialization(String path, String xmlFileName, String jsonFileName) throws IOException, JAXBException { - Library xmlLibrary = null; - try { - xmlLibrary = CqlLibraryReader.read(new FileReader(path + "/" + xmlFileName)); - } - catch (Exception e) { - throw new IllegalArgumentException(String.format("Errors occurred reading ELM from xml %s: %s", xmlFileName, e.getMessage())); - } - - Library jsonLibrary = null; - try { - jsonLibrary = JsonCqlLibraryReader.read(new FileReader(path + "/" + jsonFileName)); - } - catch (Exception e) { - throw new IllegalArgumentException(String.format("Errors occurred reading ELM from json %s: %s", jsonFileName, e.getMessage())); - } - - if (xmlLibrary != null && jsonLibrary != null) { - Assert.assertTrue(equivalent(xmlLibrary, jsonLibrary)); - } - } - - private void testElmDeserialization(String directoryName) throws URISyntaxException, IOException, JAXBException { - URL dirURL = ElmTests.class.getResource(String.format("ElmTests/Regression/%s/", directoryName)); - File file = new File(dirURL.toURI()); - for (String fileName : file.list()) { - if (fileName.endsWith(".xml")) { - try { - testElmDeserialization(file.getAbsolutePath(), fileName, fileName.substring(0, fileName.length() - 4) + ".json"); - } - catch (Exception e) { - throw new IllegalArgumentException(String.format("Errors occurred testing: %s", fileName)); - } - } - } - } - - @Test - public void RegressionTestJsonSerializer() throws URISyntaxException, IOException, JAXBException { - // This test validates that the ELM library deserialized from the Json matches the ELM library deserialized from Xml - // Regression inputs are annual update measure Xml for QDM and FHIR - testElmDeserialization("qdm"); - testElmDeserialization("fhir"); - testElmDeserialization("qdm2020"); - } - - private static boolean equivalent(Library left, Library right) { - if (left == null && right == null) { - return true; - } - - if (left != null) { - return left.getIdentifier().equals(right.getIdentifier()); - } - - // TODO: validate ELM equivalence... big job... - // Simplest would be to introduce on Executable... - - return false; - } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRDummy.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRDummy.json index 1e7117cac..0c43448ca 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRDummy.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRDummy.json @@ -57,6 +57,7 @@ "dataType" : "{http://hl7.org/fhir}Observation" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -102,7 +103,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRTerminologyDummy.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRTerminologyDummy.json index a0637439f..f41e2677a 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRTerminologyDummy.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ANCFHIRTerminologyDummy.json @@ -140,6 +140,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -235,7 +236,8 @@ "codeProperty" : "code" }, "annotation" : [ { - "s" : { + "type" : "Annotation", + "s": { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", "declaredType" : "org.hl7.cql_annotations.r1.Narrative", @@ -374,6 +376,7 @@ "locator" : "23:3-24:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -572,7 +575,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "type" : "CqlToElmInfo", + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdultOutpatientEncounters_FHIR4-2.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdultOutpatientEncounters_FHIR4-2.0.000.json index 40722caac..d73b9aaa6 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdultOutpatientEncounters_FHIR4-2.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdultOutpatientEncounters_FHIR4-2.0.000.json @@ -518,6 +518,7 @@ "locator" : "33:2-41:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1091,7 +1092,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdvancedIllnessandFrailtyExclusion_FHIR4-5.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdvancedIllnessandFrailtyExclusion_FHIR4-5.0.000.json index 769730343..7565fbca0 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdvancedIllnessandFrailtyExclusion_FHIR4-5.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/AdvancedIllnessandFrailtyExclusion_FHIR4-5.0.000.json @@ -476,6 +476,7 @@ "locator" : "39:5-39:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1006,6 +1007,7 @@ "locator" : "42:2-52:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2014,6 +2016,7 @@ "locator" : "55:2-59:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2737,6 +2740,7 @@ "locator" : "62:2-69:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3497,6 +3501,7 @@ "locator" : "72:2-75:9" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4364,6 +4369,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6046,6 +6052,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7068,6 +7075,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7620,6 +7628,7 @@ "name" : "Intervals" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8044,6 +8053,7 @@ "name" : "CumulativeDays" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8128,6 +8138,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8185,8 +8196,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, @@ -8197,6 +8210,7 @@ "errorType" : "semantic", "errorSeverity" : "warning" }, { + "type": "CqlToElmError", "libraryId" : "AdvancedIllnessandFrailtyExclusion_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 78, @@ -8207,6 +8221,7 @@ "errorType" : "semantic", "errorSeverity" : "warning" }, { + "type": "CqlToElmError", "libraryId" : "AdvancedIllnessandFrailtyExclusion_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 78, @@ -8217,6 +8232,7 @@ "errorType" : "semantic", "errorSeverity" : "warning" }, { + "type": "CqlToElmError", "libraryId" : "AdvancedIllnessandFrailtyExclusion_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 81, @@ -8227,6 +8243,7 @@ "errorType" : "semantic", "errorSeverity" : "warning" }, { + "type": "CqlToElmError", "libraryId" : "AdvancedIllnessandFrailtyExclusion_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 81, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM124_FHIR4-9.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM124_FHIR4-9.0.000.json index 084e91b13..2adef20a3 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM124_FHIR4-9.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM124_FHIR4-9.0.000.json @@ -446,6 +446,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -553,6 +554,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -660,6 +662,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -747,6 +750,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -968,6 +972,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1430,6 +1435,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1786,6 +1792,7 @@ "locator" : "70:3-75:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2544,6 +2551,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2982,6 +2990,7 @@ "locator" : "83:2-86:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4024,6 +4033,7 @@ "locator" : "89:2-93:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5041,6 +5051,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5148,8 +5159,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM139_FHIR4-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM139_FHIR4-9.1.000.json index bedf859f5..302f9fde0 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM139_FHIR4-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/EXM139_FHIR4-9.1.000.json @@ -500,6 +500,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -607,6 +608,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -714,6 +716,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -801,6 +804,7 @@ "libraryName" : "SDE" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1332,6 +1336,7 @@ "locator" : "59:2-71:41" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2374,6 +2379,7 @@ "locator" : "54:1-56:37" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2780,6 +2786,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2996,6 +3003,7 @@ "locator" : "77:1-79:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3480,8 +3488,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/Hospice_FHIR4-2.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/Hospice_FHIR4-2.0.000.json index 5290173e7..30447539c 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/Hospice_FHIR4-2.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/Hospice_FHIR4-2.0.000.json @@ -752,6 +752,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2180,8 +2181,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/MATGlobalCommonFunctions_FHIR4-5.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/MATGlobalCommonFunctions_FHIR4-5.0.000.json index 10d7ba45d..6239dfb17 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/MATGlobalCommonFunctions_FHIR4-5.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/MATGlobalCommonFunctions_FHIR4-5.0.000.json @@ -936,6 +936,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1310,6 +1311,7 @@ "locator" : "72:2-75:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1757,6 +1759,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2113,6 +2116,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2348,6 +2352,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2514,6 +2519,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2749,6 +2755,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2915,6 +2922,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3150,6 +3158,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3306,6 +3315,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4119,6 +4129,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4892,6 +4903,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5515,6 +5527,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5676,6 +5689,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5828,6 +5842,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6056,6 +6071,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6603,6 +6619,7 @@ "name" : "TheEncounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8508,6 +8525,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8735,6 +8753,7 @@ "name" : "choice" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14214,6 +14233,7 @@ "name" : "condition" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19454,6 +19474,7 @@ "name" : "condition" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19802,6 +19823,7 @@ "name" : "uri" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19994,6 +20016,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20595,6 +20618,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21486,6 +21510,7 @@ "name" : "reference" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21918,6 +21943,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22395,6 +22421,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22613,6 +22640,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23043,6 +23071,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23261,6 +23290,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23738,6 +23768,7 @@ "name" : "url" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23946,6 +23977,7 @@ "name" : "resource" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24154,6 +24186,7 @@ "name" : "request" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -25038,8 +25071,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/SupplementalDataElements_FHIR4-2.0.0.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/SupplementalDataElements_FHIR4-2.0.0.json index b00ab1de1..97b3efd96 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/SupplementalDataElements_FHIR4-2.0.0.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/SupplementalDataElements_FHIR4-2.0.0.json @@ -496,6 +496,7 @@ "locator" : "22:3-29:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1330,6 +1331,7 @@ "locator" : "32:5-36:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2052,6 +2054,7 @@ "locator" : "39:3-46:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2919,6 +2922,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3475,7 +3479,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/TJCOverall_FHIR4-5.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/TJCOverall_FHIR4-5.0.000.json index 0eecae058..b36e2e928 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/TJCOverall_FHIR4-5.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/TJCOverall_FHIR4-5.0.000.json @@ -650,6 +650,7 @@ "locator" : "42:2-46:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1265,6 +1266,7 @@ "locator" : "58:2-60:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1768,6 +1770,7 @@ "locator" : "49:2-51:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2317,6 +2320,7 @@ "locator" : "76:2-78:149" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2886,6 +2890,7 @@ "locator" : "54:2-55:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3395,6 +3400,7 @@ "locator" : "63:2-68:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4332,6 +4338,7 @@ "locator" : "71:2-73:183" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4827,6 +4834,7 @@ "name" : "StartValue" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5163,8 +5171,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/VTEICU_FHIR4-4.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/VTEICU_FHIR4-4.0.000.json index c0d1e12fd..40a4cd549 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/VTEICU_FHIR4-4.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/fhir/VTEICU_FHIR4-4.0.000.json @@ -223,6 +223,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -736,6 +737,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1536,6 +1538,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1700,6 +1703,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1851,6 +1855,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2316,8 +2321,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type": "CqlToElmError", "libraryId" : "MATGlobalCommonFunctions_FHIR4", "libraryVersion" : "5.0.000", "startLine" : 286, diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json index 3f3eda055..c813b80eb 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json @@ -370,6 +370,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -465,6 +466,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -560,6 +562,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -655,6 +658,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1057,6 +1061,7 @@ "locator" : "53:2-62:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1978,6 +1983,7 @@ "locator" : "46:2-50:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2626,6 +2632,7 @@ "locator" : "70:2-72:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2996,6 +3003,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3149,6 +3157,7 @@ "locator" : "65:2-67:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3456,7 +3465,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Adult_Outpatient_Encounters-1.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Adult_Outpatient_Encounters-1.2.000.json index 8e3fc7da6..36a7024ca 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Adult_Outpatient_Encounters-1.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Adult_Outpatient_Encounters-1.2.000.json @@ -382,6 +382,7 @@ "locator" : "16:2-21:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,7 +854,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdvancedIllnessandFrailtyExclusionECQM-4.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdvancedIllnessandFrailtyExclusionECQM-4.0.000.json index 345b95c77..e55f0a64f 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdvancedIllnessandFrailtyExclusionECQM-4.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AdvancedIllnessandFrailtyExclusionECQM-4.0.000.json @@ -669,6 +669,7 @@ "locator" : "30:2-38:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1520,6 +1521,7 @@ "locator" : "41:2-45:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2172,6 +2174,7 @@ "locator" : "48:2-53:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2790,6 +2793,7 @@ "locator" : "56:2-58:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3606,6 +3610,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5219,6 +5224,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6462,6 +6468,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7106,6 +7113,7 @@ "name" : "Intervals" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7530,6 +7538,7 @@ "name" : "CumulativeDays" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7614,6 +7623,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7671,7 +7681,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AnticoagulationTherapyforAtrialFibrillationFlutter-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AnticoagulationTherapyforAtrialFibrillationFlutter-9.1.000.json index e0ee72d57..d90bd48c9 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AnticoagulationTherapyforAtrialFibrillationFlutter-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AnticoagulationTherapyforAtrialFibrillationFlutter-9.1.000.json @@ -289,6 +289,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -384,6 +385,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -479,6 +481,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -574,6 +577,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -754,6 +758,7 @@ "locator" : "38:2-40:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1105,6 +1110,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1188,6 +1194,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1389,6 +1396,7 @@ "locator" : "49:2-51:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1834,6 +1842,7 @@ "locator" : "75:2-78:48" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2268,6 +2277,7 @@ "locator" : "59:2-62:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2618,6 +2628,7 @@ "locator" : "65:2-67:58" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2822,6 +2833,7 @@ "locator" : "54:2-56:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3195,6 +3207,7 @@ "locator" : "70:2-72:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3613,6 +3626,7 @@ "locator" : "91:2-93:149" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4238,6 +4252,7 @@ "locator" : "81:2-88:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4902,7 +4917,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntidepressantMedicationManagement-8.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntidepressantMedicationManagement-8.3.000.json index 625a293d3..85eec22fa 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntidepressantMedicationManagement-8.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntidepressantMedicationManagement-8.3.000.json @@ -397,6 +397,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -492,6 +493,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -587,6 +589,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +685,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1036,6 +1040,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveMedicationDispensed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1812,6 +1817,7 @@ "locator" : "109:2-113:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2479,6 +2485,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2941,6 +2948,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3030,6 +3038,7 @@ "name" : "Cumulative Medication Duration Greater Than or Equal to 84 Days" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3228,6 +3237,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4105,6 +4115,7 @@ "locator" : "62:2-73:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5161,6 +5172,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5596,6 +5608,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5899,6 +5912,7 @@ "locator" : "96:2-100:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6564,6 +6578,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6653,6 +6668,7 @@ "name" : "Cumulative Medication Duration Greater Than or Equal to 180 Days" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6849,6 +6865,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7386,7 +7403,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntithromboticTherapyByEndofHospitalDay2-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntithromboticTherapyByEndofHospitalDay2-8.1.000.json index 1e64d4af7..233be2fe1 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntithromboticTherapyByEndofHospitalDay2-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AntithromboticTherapyByEndofHospitalDay2-8.1.000.json @@ -261,6 +261,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -356,6 +357,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +453,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -546,6 +549,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -758,6 +762,7 @@ "locator" : "105:2-107:161" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1179,6 +1184,7 @@ "name" : "Encounter with Antithrombotic Therapy" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1238,6 +1244,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1331,6 +1338,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1437,6 +1445,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1595,6 +1604,7 @@ "locator" : "48:2-49:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1815,6 +1825,7 @@ "locator" : "52:2-54:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2250,6 +2261,7 @@ "locator" : "57:2-59:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2649,6 +2661,7 @@ "locator" : "62:2-63:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2891,6 +2904,7 @@ "locator" : "66:2-68:205" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3484,6 +3498,7 @@ "locator" : "71:2-73:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4006,6 +4021,7 @@ "locator" : "76:2-78:152" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4446,6 +4462,7 @@ "locator" : "81:2-82:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4762,6 +4779,7 @@ "locator" : "85:2-87:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5207,6 +5225,7 @@ "locator" : "99:2-102:24" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5813,6 +5832,7 @@ "locator" : "124:2-126:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6284,6 +6304,7 @@ "locator" : "90:2-96:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6664,6 +6685,7 @@ "locator" : "110:2-112:156" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7190,6 +7212,7 @@ "locator" : "115:2-117:157" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7635,6 +7658,7 @@ "locator" : "120:2-121:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7714,7 +7738,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTestingforChildrenwithPharyngitis-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTestingforChildrenwithPharyngitis-8.2.000.json index a83a20e34..7567ccc25 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTestingforChildrenwithPharyngitis-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTestingforChildrenwithPharyngitis-8.2.000.json @@ -495,6 +495,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -590,6 +591,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +687,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -780,6 +783,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1373,6 +1377,7 @@ "locator" : "77:2-91:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2558,6 +2563,7 @@ "locator" : "57:2-60:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3113,6 +3119,7 @@ "locator" : "69:2-71:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3401,6 +3408,7 @@ "locator" : "63:2-66:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3895,6 +3903,7 @@ "locator" : "109:2-112:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4391,6 +4400,7 @@ "locator" : "53:2-54:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4567,6 +4577,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4701,6 +4712,7 @@ "locator" : "94:2-95:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5146,6 +5158,7 @@ "locator" : "98:2-101:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6185,6 +6198,7 @@ "locator" : "126:2-130:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6831,6 +6845,7 @@ "locator" : "104:2-106:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7344,6 +7359,7 @@ "locator" : "115:2-123:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8090,7 +8106,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTreatmentforChildrenwithUpperRespiratoryInfectionURI-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTreatmentforChildrenwithUpperRespiratoryInfectionURI-8.1.000.json index 3aa193e8b..8734737df 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTreatmentforChildrenwithUpperRespiratoryInfectionURI-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateTreatmentforChildrenwithUpperRespiratoryInfectionURI-8.1.000.json @@ -341,6 +341,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -436,6 +437,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -531,6 +533,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -626,6 +629,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -922,6 +926,7 @@ "locator" : "45:2-50:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1580,6 +1585,7 @@ "locator" : "57:2-61:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2267,6 +2273,7 @@ "locator" : "88:2-92:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2900,6 +2907,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2991,6 +2999,7 @@ "locator" : "53:2-54:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3418,6 +3427,7 @@ "locator" : "64:2-68:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4181,6 +4191,7 @@ "locator" : "71:2-74:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4889,6 +4900,7 @@ "locator" : "82:2-85:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5637,6 +5649,7 @@ "locator" : "77:2-79:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5750,7 +5763,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-2.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-2.4.000.json index 057623118..e4f9ad760 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-2.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-2.4.000.json @@ -1203,6 +1203,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1298,6 +1299,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1393,6 +1395,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1488,6 +1491,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1784,6 +1788,7 @@ "locator" : "107:2-112:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2469,6 +2474,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3132,6 +3138,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3262,6 +3269,7 @@ "locator" : "94:2-95:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3557,6 +3565,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3882,6 +3891,7 @@ "locator" : "102:2-104:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4360,6 +4370,7 @@ "locator" : "115:2-121:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4924,6 +4935,7 @@ "locator" : "124:2-126:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5552,6 +5564,7 @@ "locator" : "129:2-140:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6465,6 +6478,7 @@ "locator" : "143:2-147:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7043,6 +7057,7 @@ "locator" : "150:2-154:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7604,6 +7619,7 @@ "locator" : "169:2-171:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8296,6 +8312,7 @@ "locator" : "157:2-162:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8805,6 +8822,7 @@ "locator" : "165:2-166:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9112,6 +9130,7 @@ "locator" : "174:2-175:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9498,6 +9517,7 @@ "locator" : "188:2-192:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10005,6 +10025,7 @@ "locator" : "195:2-196:37" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10651,6 +10672,7 @@ "locator" : "178:2-185:48" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10981,6 +11003,7 @@ "name" : "frequency" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13529,6 +13552,7 @@ "name" : "dosesPerDay" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14106,6 +14130,7 @@ "locator" : "248:2-258:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15328,6 +15353,7 @@ "locator" : "230:2-240:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16145,6 +16171,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16763,6 +16790,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17767,6 +17795,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17959,7 +17988,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-3.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-3.1.000.json index f840ce7b7..9f6804e20 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-3.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-3.1.000.json @@ -295,6 +295,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -390,6 +391,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -485,6 +487,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +583,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -681,6 +685,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -827,6 +832,7 @@ "locator" : "40:2-41:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1142,6 +1148,7 @@ "locator" : "55:2-57:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1622,6 +1629,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}MedicationActive" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2410,6 +2418,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2558,6 +2567,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2755,6 +2765,7 @@ "locator" : "60:2-63:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3392,6 +3403,7 @@ "locator" : "66:2-69:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3929,6 +3941,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4193,6 +4206,7 @@ "locator" : "82:2-88:24" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4943,6 +4957,7 @@ "locator" : "91:2-97:24" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5528,6 +5543,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5685,7 +5701,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/BreastCancerScreening-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/BreastCancerScreening-8.4.000.json index 55af8ebd6..8d2a8dbb7 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/BreastCancerScreening-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/BreastCancerScreening-8.4.000.json @@ -411,6 +411,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +507,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +603,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -696,6 +699,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -949,6 +953,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1476,6 +1481,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1609,6 +1615,7 @@ "locator" : "51:2-53:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2016,6 +2023,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2443,6 +2451,7 @@ "locator" : "63:2-65:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2777,6 +2786,7 @@ "locator" : "68:2-70:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3111,6 +3121,7 @@ "locator" : "73:2-75:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3444,6 +3455,7 @@ "locator" : "78:2-80:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3866,6 +3878,7 @@ "locator" : "83:2-88:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4565,6 +4578,7 @@ "locator" : "91:2-96:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5421,6 +5435,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6576,7 +6591,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Cataracts2040orBetterVisualAcuitywithin90DaysFollowingCataractSurgery-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Cataracts2040orBetterVisualAcuitywithin90DaysFollowingCataractSurgery-8.1.000.json index 557046155..8bdccd19f 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Cataracts2040orBetterVisualAcuitywithin90DaysFollowingCataractSurgery-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Cataracts2040orBetterVisualAcuitywithin90DaysFollowingCataractSurgery-8.1.000.json @@ -1056,6 +1056,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1151,6 +1152,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1246,6 +1248,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1341,6 +1344,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1529,6 +1533,7 @@ "locator" : "95:2-98:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2042,6 +2047,7 @@ "locator" : "167:2-169:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2412,6 +2418,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2704,6 +2711,7 @@ "locator" : "101:2-105:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5053,6 +5061,7 @@ "locator" : "108:2-164:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8508,7 +8517,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CataractsComplicationswithin30DaysFollowingCataractSurgeryRequiringAdditionalSurgicalProcedures-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CataractsComplicationswithin30DaysFollowingCataractSurgeryRequiringAdditionalSurgicalProcedures-8.1.000.json index c75541b92..cae01fefd 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CataractsComplicationswithin30DaysFollowingCataractSurgeryRequiringAdditionalSurgicalProcedures-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CataractsComplicationswithin30DaysFollowingCataractSurgeryRequiringAdditionalSurgicalProcedures-8.1.000.json @@ -796,6 +796,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -891,6 +892,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -986,6 +988,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1081,6 +1084,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1216,6 +1220,7 @@ "locator" : "74:2-75:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1560,6 +1565,7 @@ "locator" : "139:2-141:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1930,6 +1936,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2085,6 +2092,7 @@ "locator" : "81:2-83:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3486,6 +3494,7 @@ "locator" : "90:2-122:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5586,6 +5595,7 @@ "locator" : "86:2-87:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6129,6 +6139,7 @@ "locator" : "125:2-136:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6992,7 +7003,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CervicalCancerScreening-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CervicalCancerScreening-8.1.000.json index 66965d530..24770cf98 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CervicalCancerScreening-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CervicalCancerScreening-8.1.000.json @@ -377,6 +377,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +473,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -567,6 +569,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -662,6 +665,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -920,6 +924,7 @@ "locator" : "47:2-51:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1547,6 +1552,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2235,6 +2241,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2362,6 +2369,7 @@ "locator" : "54:2-56:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2674,6 +2682,7 @@ "locator" : "59:2-60:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3031,6 +3040,7 @@ "locator" : "63:2-65:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3389,6 +3399,7 @@ "locator" : "68:2-70:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3685,6 +3696,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4101,6 +4113,7 @@ "locator" : "88:2-93:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4904,6 +4917,7 @@ "locator" : "82:2-85:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5405,6 +5419,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5512,7 +5527,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json index 4f6398f10..6f33bfcd9 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-8.1.000.json @@ -384,6 +384,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -479,6 +480,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -574,6 +576,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -669,6 +672,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1137,6 +1141,7 @@ "locator" : "47:2-58:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2149,6 +2154,7 @@ "locator" : "66:2-69:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2706,6 +2712,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2859,6 +2866,7 @@ "locator" : "61:2-63:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3166,7 +3174,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildhoodImmunizationStatus-8.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildhoodImmunizationStatus-8.3.000.json index 6c2849da7..b2f1becd2 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildhoodImmunizationStatus-8.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildhoodImmunizationStatus-8.3.000.json @@ -1219,6 +1219,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1314,6 +1315,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1409,6 +1411,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1504,6 +1507,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1762,6 +1766,7 @@ "locator" : "108:2-112:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2352,6 +2357,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2965,6 +2971,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3240,6 +3247,7 @@ "locator" : "438:2-442:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4189,6 +4197,7 @@ "locator" : "445:2-449:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5077,6 +5086,7 @@ "locator" : "140:2-146:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5856,6 +5866,7 @@ "locator" : "156:2-162:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6635,6 +6646,7 @@ "locator" : "174:2-180:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7297,6 +7309,7 @@ "locator" : "102:2-105:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7674,6 +7687,7 @@ "locator" : "237:2-241:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8625,6 +8639,7 @@ "locator" : "115:2-123:25" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9462,6 +9477,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9774,6 +9790,7 @@ "locator" : "230:2-234:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10725,6 +10742,7 @@ "locator" : "129:2-137:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11669,6 +11687,7 @@ "locator" : "149:2-153:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12220,6 +12239,7 @@ "locator" : "165:2-171:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13047,6 +13067,7 @@ "locator" : "261:2-265:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13901,6 +13922,7 @@ "locator" : "183:2-189:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14741,6 +14763,7 @@ "locator" : "372:2-376:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15629,6 +15652,7 @@ "locator" : "192:2-198:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16469,6 +16493,7 @@ "locator" : "301:2-305:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17294,6 +17319,7 @@ "locator" : "201:2-205:24" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17906,6 +17932,7 @@ "locator" : "283:2-287:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18855,6 +18882,7 @@ "locator" : "290:2-294:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19602,6 +19630,7 @@ "locator" : "208:2-209:48" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19814,6 +19843,7 @@ "locator" : "490:2-493:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20627,6 +20657,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21624,6 +21655,7 @@ "locator" : "244:2-246:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22511,6 +22543,7 @@ "locator" : "249:2-258:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24165,6 +24198,7 @@ "locator" : "268:2-280:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -25677,6 +25711,7 @@ "locator" : "297:2-298:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -26329,6 +26364,7 @@ "locator" : "308:2-313:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27391,6 +27427,7 @@ "locator" : "316:2-325:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -28717,6 +28754,7 @@ "locator" : "328:2-332:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -29721,6 +29759,7 @@ "locator" : "335:2-344:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -31055,6 +31094,7 @@ "locator" : "347:2-351:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -31957,6 +31997,7 @@ "locator" : "354:2-358:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -32859,6 +32900,7 @@ "locator" : "361:2-365:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -33639,6 +33681,7 @@ "locator" : "368:2-369:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -34248,6 +34291,7 @@ "locator" : "379:2-383:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -35028,6 +35072,7 @@ "locator" : "386:2-390:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -35999,6 +36044,7 @@ "locator" : "393:2-402:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -37920,6 +37966,7 @@ "locator" : "405:2-426:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -40651,6 +40698,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -42789,7 +42837,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildrenWhoHaveDentalDecayorCavities-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildrenWhoHaveDentalDecayorCavities-8.1.000.json index 7d90fc726..399bc5a16 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildrenWhoHaveDentalDecayorCavities-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChildrenWhoHaveDentalDecayorCavities-8.1.000.json @@ -327,6 +327,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -422,6 +423,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +519,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -612,6 +615,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -937,6 +941,7 @@ "locator" : "52:2-58:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1591,6 +1596,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1992,6 +1998,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2120,6 +2127,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2387,6 +2395,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2460,7 +2469,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChlamydiaScreeningforWomen-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChlamydiaScreeningforWomen-8.1.000.json index 47114cc22..c8c5906d2 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChlamydiaScreeningforWomen-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ChlamydiaScreeningforWomen-8.1.000.json @@ -671,6 +671,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +767,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -861,6 +863,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -956,6 +959,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1185,6 +1189,7 @@ "locator" : "65:2-68:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1796,6 +1801,7 @@ "locator" : "74:2-80:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2462,6 +2468,7 @@ "locator" : "136:2-140:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3181,6 +3188,7 @@ "locator" : "124:2-133:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3967,6 +3975,7 @@ "locator" : "116:2-117:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4256,6 +4265,7 @@ "locator" : "120:2-121:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4633,6 +4643,7 @@ "locator" : "83:2-86:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5090,6 +5101,7 @@ "locator" : "99:2-101:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5429,6 +5441,7 @@ "locator" : "89:2-90:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6003,6 +6016,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7103,6 +7117,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7251,6 +7266,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7964,6 +7980,7 @@ "locator" : "168:2-177:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9229,6 +9246,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10207,6 +10225,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10865,6 +10884,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11370,7 +11390,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ClosingtheReferralLoopReceiptofSpecialistReport-8.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ClosingtheReferralLoopReceiptofSpecialistReport-8.0.000.json index 7d52bf29a..54ca95ddc 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ClosingtheReferralLoopReceiptofSpecialistReport-8.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ClosingtheReferralLoopReceiptofSpecialistReport-8.0.000.json @@ -279,6 +279,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -374,6 +375,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -469,6 +471,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -564,6 +567,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -889,6 +893,7 @@ "locator" : "42:2-48:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1525,6 +1530,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveInterventionPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1860,6 +1866,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1974,6 +1981,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2144,6 +2152,7 @@ "locator" : "60:2-63:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2623,6 +2632,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2679,7 +2689,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ColorectalCancerScreening-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ColorectalCancerScreening-8.4.000.json index 7efda9560..bcb30a89c 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ColorectalCancerScreening-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ColorectalCancerScreening-8.4.000.json @@ -341,6 +341,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -436,6 +437,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -531,6 +533,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -626,6 +629,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -842,6 +846,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1269,6 +1274,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1475,6 +1481,7 @@ "locator" : "46:2-48:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1858,6 +1865,7 @@ "locator" : "51:2-53:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2191,6 +2199,7 @@ "locator" : "56:2-58:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2534,6 +2543,7 @@ "locator" : "61:2-63:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3009,6 +3019,7 @@ "locator" : "66:2-68:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3482,6 +3493,7 @@ "locator" : "78:2-81:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4023,6 +4035,7 @@ "locator" : "84:2-86:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4427,6 +4440,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4875,6 +4889,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5549,7 +5564,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ControllingHighBloodPressure-8.5.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ControllingHighBloodPressure-8.5.000.json index bc1af0dc3..b950d2d98 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ControllingHighBloodPressure-8.5.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ControllingHighBloodPressure-8.5.000.json @@ -441,6 +441,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -536,6 +537,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -631,6 +633,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -726,6 +729,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1009,6 +1013,7 @@ "locator" : "118:2-124:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1876,6 +1881,7 @@ "locator" : "127:2-133:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2668,6 +2674,7 @@ "locator" : "98:2-104:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3149,6 +3156,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Date" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3416,6 +3424,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3792,6 +3801,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4017,6 +4027,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4393,6 +4404,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4519,6 +4531,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4777,6 +4790,7 @@ "locator" : "53:2-57:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5393,6 +5407,7 @@ "locator" : "75:2-77:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5956,6 +5971,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6434,6 +6450,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6567,6 +6584,7 @@ "locator" : "63:2-65:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6977,6 +6995,7 @@ "locator" : "68:2-72:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7561,6 +7580,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8311,7 +8331,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CoronaryArteryDiseaseCADBetaBlockerTherapyPriorMyocardialInfarctionMIorLeftVentricularSystolicDysfunctionLVEF40-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CoronaryArteryDiseaseCADBetaBlockerTherapyPriorMyocardialInfarctionMIorLeftVentricularSystolicDysfunctionLVEF40-8.2.000.json index 35f2d3bcd..918d0cf82 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CoronaryArteryDiseaseCADBetaBlockerTherapyPriorMyocardialInfarctionMIorLeftVentricularSystolicDysfunctionLVEF40-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/CoronaryArteryDiseaseCADBetaBlockerTherapyPriorMyocardialInfarctionMIorLeftVentricularSystolicDysfunctionLVEF40-8.2.000.json @@ -628,6 +628,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -723,6 +724,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -818,6 +820,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +916,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1209,6 +1213,7 @@ "locator" : "62:2-67:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1790,6 +1795,7 @@ "locator" : "254:2-256:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2218,6 +2224,7 @@ "locator" : "248:2-251:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2579,6 +2586,7 @@ "locator" : "70:2-71:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3103,6 +3111,7 @@ "locator" : "74:2-85:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4179,6 +4188,7 @@ "locator" : "88:2-90:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4681,6 +4691,7 @@ "locator" : "220:2-222:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5164,6 +5175,7 @@ "locator" : "93:2-95:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5581,6 +5593,7 @@ "locator" : "98:2-100:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5998,6 +6011,7 @@ "locator" : "103:2-105:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6415,6 +6429,7 @@ "locator" : "108:2-110:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6827,6 +6842,7 @@ "locator" : "113:2-115:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7239,6 +7255,7 @@ "locator" : "118:2-120:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7656,6 +7673,7 @@ "locator" : "123:2-125:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8073,6 +8091,7 @@ "locator" : "128:2-130:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8490,6 +8509,7 @@ "locator" : "133:2-135:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8907,6 +8927,7 @@ "locator" : "138:2-140:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9324,6 +9345,7 @@ "locator" : "176:2-178:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9674,6 +9696,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9891,6 +9914,7 @@ "locator" : "171:2-173:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10241,6 +10265,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10458,6 +10483,7 @@ "locator" : "151:2-153:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10875,6 +10901,7 @@ "locator" : "156:2-158:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11293,6 +11320,7 @@ "locator" : "161:2-163:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11711,6 +11739,7 @@ "locator" : "166:2-168:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12128,6 +12157,7 @@ "locator" : "181:2-183:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12545,6 +12575,7 @@ "locator" : "186:2-188:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12962,6 +12993,7 @@ "locator" : "191:2-193:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13379,6 +13411,7 @@ "locator" : "196:2-198:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13796,6 +13829,7 @@ "locator" : "201:2-203:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14213,6 +14247,7 @@ "locator" : "206:2-208:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14776,6 +14811,7 @@ "locator" : "211:2-217:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15467,6 +15503,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15994,6 +16031,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16115,6 +16153,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16284,6 +16323,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16586,6 +16626,7 @@ "locator" : "238:2-240:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16972,6 +17013,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17543,6 +17585,7 @@ "locator" : "283:2-293:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18789,6 +18832,7 @@ "locator" : "309:2-315:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19672,6 +19716,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20549,6 +20594,7 @@ "locator" : "296:2-306:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21795,6 +21841,7 @@ "locator" : "318:2-324:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22678,6 +22725,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23176,7 +23224,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DayMonthTimings-1.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DayMonthTimings-1.2.000.json index 2bc6a9622..d0bf9114d 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DayMonthTimings-1.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DayMonthTimings-1.2.000.json @@ -290,6 +290,7 @@ "locator" : "11:2-11:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -552,6 +553,7 @@ "locator" : "15:2-15:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -821,6 +823,7 @@ "locator" : "19:2-19:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1097,6 +1100,7 @@ "locator" : "23:2-23:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1240,6 +1244,7 @@ "locator" : "27:2-27:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1297,6 +1302,7 @@ "name" : "yr" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1706,6 +1712,7 @@ "name" : "mo" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2562,6 +2569,7 @@ "name" : "yr" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2934,6 +2942,7 @@ "name" : "period" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5873,7 +5882,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DementiaCognitiveAssessment-8.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DementiaCognitiveAssessment-8.0.000.json index b37cf4b79..3848f6ef3 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DementiaCognitiveAssessment-8.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DementiaCognitiveAssessment-8.0.000.json @@ -363,6 +363,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -458,6 +459,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -553,6 +555,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -648,6 +651,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1078,6 +1082,7 @@ "locator" : "67:2-76:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1891,6 +1896,7 @@ "locator" : "106:2-108:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2330,6 +2336,7 @@ "locator" : "41:2-44:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2977,6 +2984,7 @@ "locator" : "47:2-51:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3632,6 +3640,7 @@ "locator" : "54:2-57:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4395,6 +4404,7 @@ "locator" : "89:2-99:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5212,6 +5222,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5377,6 +5388,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5548,6 +5560,7 @@ "locator" : "83:2-86:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6008,6 +6021,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6158,6 +6172,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6265,7 +6280,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionRemissionatTwelveMonths-8.6.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionRemissionatTwelveMonths-8.6.000.json index 42a8bc6b1..4adaec91e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionRemissionatTwelveMonths-8.6.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionRemissionatTwelveMonths-8.6.000.json @@ -412,6 +412,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -507,6 +508,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -602,6 +604,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +700,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -867,6 +871,7 @@ "locator" : "104:2-105:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1136,6 +1141,7 @@ "locator" : "55:2-56:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1340,6 +1346,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1689,6 +1696,7 @@ "locator" : "89:2-92:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2294,6 +2302,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3102,6 +3111,7 @@ "locator" : "62:2-63:167" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3756,6 +3766,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4286,6 +4297,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4754,6 +4766,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4988,6 +5001,7 @@ "locator" : "66:2-71:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5502,6 +5516,7 @@ "locator" : "74:2-76:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5836,6 +5851,7 @@ "locator" : "79:2-81:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6156,6 +6172,7 @@ "locator" : "84:2-86:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6490,6 +6507,7 @@ "locator" : "108:2-110:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6845,6 +6863,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7392,6 +7411,7 @@ "locator" : "120:2-124:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8142,6 +8162,7 @@ "locator" : "127:2-130:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8567,7 +8588,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionUtilizationofthePHQ9Tool-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionUtilizationofthePHQ9Tool-8.4.000.json index 3da268630..b1c4818a4 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionUtilizationofthePHQ9Tool-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DepressionUtilizationofthePHQ9Tool-8.4.000.json @@ -412,6 +412,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -507,6 +508,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -602,6 +604,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +700,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +833,7 @@ "locator" : "99:2-100:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1021,6 +1026,7 @@ "highClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1457,6 +1463,7 @@ "locator" : "239:2-246:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2317,6 +2324,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2405,6 +2413,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2521,6 +2530,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2991,6 +3001,7 @@ "locator" : "229:2-236:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3851,6 +3862,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3939,6 +3951,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4042,6 +4055,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4478,6 +4492,7 @@ "locator" : "219:2-226:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5338,6 +5353,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5426,6 +5442,7 @@ "name" : "Initial Population 3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5677,6 +5694,7 @@ "locator" : "55:2-60:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6258,6 +6276,7 @@ "locator" : "72:2-74:59" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6582,6 +6601,7 @@ "locator" : "77:2-79:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6906,6 +6926,7 @@ "locator" : "82:2-84:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7230,6 +7251,7 @@ "locator" : "87:2-88:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7537,6 +7559,7 @@ "locator" : "91:2-92:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7844,6 +7867,7 @@ "locator" : "95:2-96:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8279,6 +8303,7 @@ "locator" : "103:2-108:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8988,6 +9013,7 @@ "locator" : "111:2-116:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9600,6 +9626,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10058,6 +10085,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10516,6 +10544,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10943,6 +10972,7 @@ "locator" : "147:2-148:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11250,6 +11280,7 @@ "locator" : "151:2-152:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11557,6 +11588,7 @@ "locator" : "155:2-156:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11842,6 +11874,7 @@ "locator" : "188:2-189:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12179,6 +12212,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12626,6 +12660,7 @@ "locator" : "184:2-185:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12963,6 +12998,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13410,6 +13446,7 @@ "locator" : "180:2-181:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13747,6 +13784,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14307,6 +14345,7 @@ "locator" : "192:2-195:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15041,6 +15080,7 @@ "locator" : "198:2-200:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15607,6 +15647,7 @@ "locator" : "203:2-206:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16341,6 +16382,7 @@ "locator" : "209:2-211:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16854,6 +16896,7 @@ "locator" : "214:2-216:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17420,6 +17463,7 @@ "locator" : "249:2-252:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18032,7 +18076,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesEyeExam-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesEyeExam-8.4.000.json index 48c6da126..a0571a615 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesEyeExam-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesEyeExam-8.4.000.json @@ -362,6 +362,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -457,6 +458,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -552,6 +554,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -647,6 +650,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -782,6 +786,7 @@ "locator" : "44:2-45:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1261,6 +1266,7 @@ "locator" : "51:2-57:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2030,6 +2036,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2727,6 +2734,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2918,6 +2926,7 @@ "locator" : "60:2-63:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3380,6 +3389,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3992,6 +4002,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4324,6 +4335,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4641,7 +4653,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesHemoglobinA1cHbA1cPoorControl9-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesHemoglobinA1cHbA1cPoorControl9-8.4.000.json index af59b317a..3c3ca56bc 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesHemoglobinA1cHbA1cPoorControl9-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesHemoglobinA1cHbA1cPoorControl9-8.4.000.json @@ -271,6 +271,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -366,6 +367,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -461,6 +463,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +559,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -866,6 +870,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1597,6 +1602,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1739,6 +1745,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveLaboratoryTestPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2110,6 +2117,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2300,6 +2308,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2485,6 +2494,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2792,6 +2802,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3039,6 +3050,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3611,7 +3623,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesMedicalAttentionforNephropathy-8.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesMedicalAttentionforNephropathy-8.4.000.json index 580de992f..07c879c6b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesMedicalAttentionforNephropathy-8.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabetesMedicalAttentionforNephropathy-8.4.000.json @@ -439,6 +439,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -534,6 +535,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -629,6 +631,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +727,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -896,6 +900,7 @@ "locator" : "50:2-53:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1171,6 +1176,7 @@ "locator" : "56:2-57:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1520,6 +1526,7 @@ "locator" : "60:2-65:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2232,6 +2239,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2963,6 +2971,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3091,6 +3100,7 @@ "locator" : "71:2-72:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3323,6 +3333,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3475,6 +3486,7 @@ "locator" : "83:2-84:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4005,6 +4017,7 @@ "locator" : "87:2-91:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4413,6 +4426,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4786,6 +4800,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5358,7 +5373,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabeticRetinopathyCommunicationwiththePhysicianManagingOngoingDiabetesCare-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabeticRetinopathyCommunicationwiththePhysicianManagingOngoingDiabetesCare-8.1.000.json index 421a11741..a09975216 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabeticRetinopathyCommunicationwiththePhysicianManagingOngoingDiabetesCare-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DiabeticRetinopathyCommunicationwiththePhysicianManagingOngoingDiabetesCare-8.1.000.json @@ -522,6 +522,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -617,6 +618,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -712,6 +714,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -807,6 +810,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1103,6 +1107,7 @@ "locator" : "58:2-63:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1684,6 +1689,7 @@ "locator" : "66:2-68:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2252,6 +2258,7 @@ "locator" : "112:2-122:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3496,6 +3503,7 @@ "locator" : "125:2-135:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4743,6 +4751,7 @@ "locator" : "138:2-148:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5796,6 +5805,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5986,6 +5996,7 @@ "name" : "Results of Dilated Macular or Fundus Exam Communicated" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6150,6 +6161,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6692,6 +6704,7 @@ "locator" : "71:2-74:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7123,6 +7136,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7374,6 +7388,7 @@ "locator" : "77:2-82:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8082,6 +8097,7 @@ "locator" : "85:2-90:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8790,6 +8806,7 @@ "locator" : "93:2-98:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9401,6 +9418,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9559,7 +9577,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonAntithromboticTherapy-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonAntithromboticTherapy-8.1.000.json index 57f0fe899..ad88bb103 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonAntithromboticTherapy-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonAntithromboticTherapy-8.1.000.json @@ -191,6 +191,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +287,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -381,6 +383,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -476,6 +479,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -572,6 +576,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -655,6 +660,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -826,6 +832,7 @@ "locator" : "37:2-39:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1219,6 +1226,7 @@ "locator" : "42:2-44:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1557,6 +1565,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1675,6 +1684,7 @@ "locator" : "50:2-51:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1914,6 +1924,7 @@ "locator" : "54:2-56:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2320,6 +2331,7 @@ "locator" : "59:2-61:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2689,6 +2701,7 @@ "locator" : "64:2-65:58" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2768,7 +2781,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonStatinMedication-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonStatinMedication-8.1.000.json index 70fff8ae8..e1953afe3 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonStatinMedication-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DischargedonStatinMedication-8.1.000.json @@ -219,6 +219,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -314,6 +315,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +411,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -504,6 +507,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -599,6 +603,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -695,6 +700,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -875,6 +881,7 @@ "locator" : "39:2-41:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1213,6 +1220,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1306,6 +1314,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1477,6 +1486,7 @@ "locator" : "50:2-52:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1996,6 +2006,7 @@ "locator" : "55:2-60:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2952,6 +2963,7 @@ "locator" : "63:2-72:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3645,6 +3657,7 @@ "locator" : "75:2-76:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3792,7 +3805,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DocumentationofCurrentMedicationsintheMedicalRecord-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DocumentationofCurrentMedicationsintheMedicalRecord-9.1.000.json index 368624d42..e2a30f172 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DocumentationofCurrentMedicationsintheMedicalRecord-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/DocumentationofCurrentMedicationsintheMedicalRecord-9.1.000.json @@ -286,6 +286,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -381,6 +382,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -476,6 +478,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -571,6 +574,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +710,7 @@ "locator" : "61:2-62:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1030,6 +1035,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1393,6 +1399,7 @@ "locator" : "57:2-58:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1535,6 +1542,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1656,6 +1664,7 @@ "locator" : "40:2-41:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1969,6 +1978,7 @@ "locator" : "44:2-46:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2359,6 +2369,7 @@ "locator" : "49:2-51:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2679,6 +2690,7 @@ "name" : "Medications Documented During Qualifying Encounter" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2724,7 +2736,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ExclusiveBreastMilkFeeding-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ExclusiveBreastMilkFeeding-8.1.000.json index e00affa28..215d92e43 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ExclusiveBreastMilkFeeding-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ExclusiveBreastMilkFeeding-8.1.000.json @@ -312,6 +312,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -407,6 +408,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -502,6 +504,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -597,6 +600,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -776,6 +780,7 @@ "locator" : "82:2-85:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1257,6 +1262,7 @@ "locator" : "62:2-67:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1939,6 +1945,7 @@ "locator" : "70:2-73:41" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2361,6 +2368,7 @@ "name" : "Single Live Birth Encounter With Gestational Age 37 Weeks or More" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2419,6 +2427,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2655,6 +2664,7 @@ "locator" : "46:2-50:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3388,6 +3398,7 @@ "locator" : "53:2-59:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4030,6 +4041,7 @@ "name" : "Single Live Birth Encounter With Newborn Fed Breast Milk Only Since Birth" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4088,6 +4100,7 @@ "name" : "Single Live Birth Encounter With Newborn to NICU or Discharge to Acute Care or Other Health Care Facility or Expired" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4133,7 +4146,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FallsScreeningforFutureFallRisk-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FallsScreeningforFutureFallRisk-8.1.000.json index ee72f04c6..9079aea7b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FallsScreeningforFutureFallRisk-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FallsScreeningforFutureFallRisk-8.1.000.json @@ -425,6 +425,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -520,6 +521,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -615,6 +617,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -710,6 +713,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1207,6 +1211,7 @@ "locator" : "55:2-66:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2151,6 +2156,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2552,6 +2558,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2663,6 +2670,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3006,6 +3014,7 @@ "locator" : "69:2-71:52" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3413,6 +3422,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3801,6 +3811,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4224,6 +4235,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4483,7 +4495,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FollowUpCareforChildrenPrescribedADHDMedicationADD-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FollowUpCareforChildrenPrescribedADHDMedicationADD-9.1.000.json index 618f8ff58..d45684747 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FollowUpCareforChildrenPrescribedADHDMedicationADD-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FollowUpCareforChildrenPrescribedADHDMedicationADD-9.1.000.json @@ -523,6 +523,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -618,6 +619,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -713,6 +715,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +811,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1066,6 +1070,7 @@ "locator" : "61:2-65:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1752,6 +1757,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveMedicationDispensed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2399,6 +2405,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2868,6 +2875,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3055,6 +3063,7 @@ "locator" : "116:2-118:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3434,6 +3443,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3943,6 +3953,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4206,6 +4217,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4709,6 +4721,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5283,6 +5296,7 @@ "locator" : "68:2-85:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6468,6 +6482,7 @@ "locator" : "88:2-90:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6898,6 +6913,7 @@ "locator" : "100:2-105:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7699,6 +7715,7 @@ "locator" : "108:2-113:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8426,6 +8443,7 @@ "locator" : "121:2-124:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8964,6 +8982,7 @@ "locator" : "127:2-130:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9627,6 +9646,7 @@ "locator" : "133:2-135:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10217,6 +10237,7 @@ "locator" : "138:2-142:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10865,6 +10886,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11027,6 +11049,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11408,6 +11431,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11788,6 +11812,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12149,6 +12174,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12230,7 +12256,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalHipReplacement-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalHipReplacement-8.1.000.json index 5b49c5c95..362d46a19 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalHipReplacement-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalHipReplacement-8.1.000.json @@ -613,6 +613,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -708,6 +709,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -803,6 +805,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -898,6 +901,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1133,6 +1137,7 @@ "locator" : "72:2-74:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1604,6 +1609,7 @@ "locator" : "105:2-108:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2108,6 +2114,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2585,6 +2592,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2704,6 +2712,7 @@ "locator" : "57:2-58:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3146,6 +3155,7 @@ "locator" : "61:2-64:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3635,6 +3645,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4377,6 +4388,7 @@ "locator" : "77:2-90:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5897,6 +5909,7 @@ "locator" : "93:2-95:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6326,6 +6339,7 @@ "locator" : "98:2-102:46" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7166,6 +7180,7 @@ "locator" : "111:2-118:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8275,6 +8290,7 @@ "locator" : "121:2-128:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9384,6 +9400,7 @@ "locator" : "131:2-138:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10407,6 +10424,7 @@ "locator" : "175:2-179:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11373,6 +11391,7 @@ "locator" : "141:2-148:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12396,6 +12415,7 @@ "locator" : "168:2-172:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13362,6 +13382,7 @@ "locator" : "151:2-158:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14256,6 +14277,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14641,7 +14663,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalKneeReplacement-8.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalKneeReplacement-8.3.000.json index ec27f8a6e..2832385af 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalKneeReplacement-8.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentforTotalKneeReplacement-8.3.000.json @@ -612,7 +612,8 @@ "dataType" : "{urn:healthit-gov:qdm:v5_4}PatientCharacteristicEthnicity", "codeProperty" : "code" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -707,7 +708,8 @@ "dataType" : "{urn:healthit-gov:qdm:v5_4}PatientCharacteristicPayer", "codeProperty" : "code" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -802,7 +804,8 @@ "dataType" : "{urn:healthit-gov:qdm:v5_4}PatientCharacteristicRace", "codeProperty" : "code" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -897,7 +900,8 @@ "dataType" : "{urn:healthit-gov:qdm:v5_4}PatientCharacteristicSex", "codeProperty" : "code" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1132,7 +1136,8 @@ "localId" : "63", "locator" : "54:2-55:97" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1501,7 +1506,8 @@ "localId" : "71", "locator" : "58:2-59:63" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1881,7 +1887,8 @@ "localId" : "85", "locator" : "104:2-107:66" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2385,7 +2392,8 @@ "locator" : "142:2-146:3", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2887,7 +2895,8 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean", "name" : "Initial Population" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3145,7 +3154,8 @@ "localId" : "120", "locator" : "65:2-68:7" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3634,7 +3644,8 @@ "locator" : "71:2-73:32", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4326,7 +4337,8 @@ "localId" : "184", "locator" : "76:2-89:42" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5950,7 +5962,8 @@ "localId" : "203", "locator" : "92:2-96:46" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6555,7 +6568,8 @@ "localId" : "210", "locator" : "99:2-101:2" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7073,7 +7087,8 @@ "localId" : "240", "locator" : "110:2-116:45" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8056,7 +8071,8 @@ "localId" : "270", "locator" : "119:2-125:45" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8995,7 +9011,8 @@ "localId" : "292", "locator" : "128:2-132:88" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9875,7 +9892,8 @@ "localId" : "314", "locator" : "135:2-139:88" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10799,7 +10817,8 @@ "localId" : "344", "locator" : "149:2-155:45" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11782,7 +11801,8 @@ "localId" : "374", "locator" : "158:2-164:45" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12765,7 +12785,8 @@ "localId" : "404", "locator" : "167:2-173:45" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13575,7 +13596,8 @@ "locator" : "176:2-180:73", "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, - "annotation" : [ { + "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13961,7 +13983,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentsforCongestiveHeartFailure-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentsforCongestiveHeartFailure-9.1.000.json index 5d04a053a..a512404c5 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentsforCongestiveHeartFailure-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/FunctionalStatusAssessmentsforCongestiveHeartFailure-9.1.000.json @@ -865,6 +865,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -960,6 +961,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1055,6 +1057,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1150,6 +1153,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1285,6 +1289,7 @@ "locator" : "67:2-68:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1697,6 +1702,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2278,6 +2284,7 @@ "locator" : "77:2-82:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3048,6 +3055,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3728,6 +3736,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3869,6 +3878,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4819,6 +4829,7 @@ "locator" : "85:2-101:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6753,6 +6764,7 @@ "locator" : "104:2-108:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7459,6 +7471,7 @@ "locator" : "111:2-115:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8160,6 +8173,7 @@ "locator" : "118:2-122:46" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9399,6 +9413,7 @@ "locator" : "125:2-144:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11706,6 +11721,7 @@ "locator" : "147:2-153:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12820,6 +12836,7 @@ "locator" : "156:2-162:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13934,6 +13951,7 @@ "locator" : "165:2-171:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15048,6 +15066,7 @@ "locator" : "174:2-180:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16221,6 +16240,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17317,6 +17337,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18413,6 +18434,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19509,6 +19531,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20605,6 +20628,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21701,6 +21725,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22797,6 +22822,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23893,6 +23919,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24989,6 +25016,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -25956,6 +25984,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -26645,7 +26674,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HFACEInhibitororARBorARNITherapyforLeftVentricularSystolicDysfunctionLVSD-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HFACEInhibitororARBorARNITherapyforLeftVentricularSystolicDysfunctionLVSD-8.2.000.json index 9653607b5..6935cd33a 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HFACEInhibitororARBorARNITherapyforLeftVentricularSystolicDysfunctionLVSD-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HFACEInhibitororARBorARNITherapyforLeftVentricularSystolicDysfunctionLVSD-8.2.000.json @@ -530,6 +530,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -625,6 +626,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -720,6 +722,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -815,6 +818,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1111,6 +1115,7 @@ "locator" : "55:2-60:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1648,6 +1653,7 @@ "locator" : "63:2-64:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1981,6 +1987,7 @@ "locator" : "67:2-69:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2398,6 +2405,7 @@ "locator" : "174:2-176:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3002,6 +3010,7 @@ "locator" : "115:2-121:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3716,6 +3725,7 @@ "locator" : "72:2-77:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4279,6 +4289,7 @@ "locator" : "80:2-82:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4753,6 +4764,7 @@ "locator" : "90:2-95:46" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5316,6 +5328,7 @@ "locator" : "85:2-87:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5879,6 +5892,7 @@ "locator" : "106:2-112:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6570,6 +6584,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7072,6 +7087,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7287,6 +7303,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7712,6 +7729,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7907,6 +7925,7 @@ "locator" : "124:2-126:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8324,6 +8343,7 @@ "locator" : "129:2-131:134" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8741,6 +8761,7 @@ "locator" : "134:2-136:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9158,6 +9179,7 @@ "locator" : "139:2-141:121" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9575,6 +9597,7 @@ "locator" : "144:2-146:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9992,6 +10015,7 @@ "locator" : "149:2-151:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10409,6 +10433,7 @@ "locator" : "154:2-156:130" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10826,6 +10851,7 @@ "locator" : "159:2-161:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11243,6 +11269,7 @@ "locator" : "164:2-166:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11660,6 +11687,7 @@ "locator" : "169:2-171:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12072,6 +12100,7 @@ "locator" : "179:2-181:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12422,6 +12451,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12639,6 +12669,7 @@ "locator" : "188:2-190:135" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13174,6 +13205,7 @@ "locator" : "223:2-230:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14061,6 +14093,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14600,6 +14633,7 @@ "locator" : "213:2-220:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15487,6 +15521,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15841,6 +15876,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15948,7 +15984,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVAIDSPneumocystisJiroveciPneumoniaPCPProphylaxis-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVAIDSPneumocystisJiroveciPneumoniaPCPProphylaxis-8.1.000.json index dd36f40ee..f7afcef29 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVAIDSPneumocystisJiroveciPneumoniaPCPProphylaxis-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVAIDSPneumocystisJiroveciPneumoniaPCPProphylaxis-8.1.000.json @@ -419,6 +419,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +515,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -609,6 +611,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -704,6 +707,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -866,6 +870,7 @@ "locator" : "65:2-67:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1362,6 +1367,7 @@ "locator" : "56:2-62:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1988,6 +1994,7 @@ "locator" : "73:2-75:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2534,6 +2541,7 @@ "locator" : "91:2-93:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3157,6 +3165,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3710,6 +3719,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3972,6 +3982,7 @@ "locator" : "96:2-98:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4645,6 +4656,7 @@ "locator" : "105:2-107:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5132,6 +5144,7 @@ "locator" : "101:2-102:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5405,6 +5418,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5975,6 +5989,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6131,6 +6146,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}Diagnosis" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6633,6 +6649,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7297,6 +7314,7 @@ "name" : "Initial Population 3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7344,6 +7362,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7857,6 +7876,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9101,6 +9121,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9705,6 +9726,7 @@ "locator" : "124:2-126:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10197,6 +10219,7 @@ "locator" : "129:2-132:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10747,6 +10770,7 @@ "locator" : "135:2-138:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11230,6 +11254,7 @@ "locator" : "141:2-143:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11722,6 +11747,7 @@ "locator" : "146:2-149:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12205,6 +12231,7 @@ "locator" : "152:2-154:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12860,6 +12887,7 @@ "locator" : "171:2-180:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13765,6 +13793,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14014,6 +14043,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14438,6 +14468,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15136,7 +15167,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVScreening-2.9.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVScreening-2.9.000.json index af6ac956a..189a11642 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVScreening-2.9.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HIVScreening-2.9.000.json @@ -342,6 +342,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -437,6 +438,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -532,6 +534,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -627,6 +630,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -923,6 +927,7 @@ "locator" : "41:2-46:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1571,6 +1576,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2159,6 +2165,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2297,6 +2304,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2862,6 +2870,7 @@ "locator" : "60:2-67:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3788,6 +3797,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3869,7 +3879,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HeartFailureHFBetaBlockerTherapyforLeftVentricularSystolicDysfunctionLVSD-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HeartFailureHFBetaBlockerTherapyforLeftVentricularSystolicDysfunctionLVSD-8.1.000.json index d9d16f6fb..373abffee 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HeartFailureHFBetaBlockerTherapyforLeftVentricularSystolicDysfunctionLVSD-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/HeartFailureHFBetaBlockerTherapyforLeftVentricularSystolicDysfunctionLVSD-8.1.000.json @@ -600,6 +600,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -695,6 +696,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -790,6 +792,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -885,6 +888,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1251,6 +1255,7 @@ "locator" : "60:2-66:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1864,6 +1869,7 @@ "locator" : "69:2-70:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2314,6 +2320,7 @@ "locator" : "73:2-78:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2895,6 +2902,7 @@ "locator" : "81:2-83:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3369,6 +3377,7 @@ "locator" : "86:2-91:46" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3932,6 +3941,7 @@ "locator" : "253:2-255:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4406,6 +4416,7 @@ "locator" : "94:2-99:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4969,6 +4980,7 @@ "locator" : "102:2-104:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5386,6 +5398,7 @@ "locator" : "107:2-109:130" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5803,6 +5816,7 @@ "locator" : "112:2-114:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6220,6 +6234,7 @@ "locator" : "117:2-119:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6637,6 +6652,7 @@ "locator" : "122:2-124:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7054,6 +7070,7 @@ "locator" : "127:2-129:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7471,6 +7488,7 @@ "locator" : "132:2-134:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7888,6 +7906,7 @@ "locator" : "137:2-139:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8300,6 +8319,7 @@ "locator" : "142:2-144:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8717,6 +8737,7 @@ "locator" : "147:2-149:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9134,6 +9155,7 @@ "locator" : "152:2-154:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9552,6 +9574,7 @@ "locator" : "157:2-159:121" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9970,6 +9993,7 @@ "locator" : "162:2-164:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10387,6 +10411,7 @@ "locator" : "167:2-169:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10804,6 +10829,7 @@ "locator" : "172:2-174:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11367,6 +11393,7 @@ "locator" : "219:2-225:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12058,6 +12085,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12560,6 +12588,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12775,6 +12804,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13200,6 +13230,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13400,6 +13431,7 @@ "locator" : "185:2-187:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13817,6 +13849,7 @@ "locator" : "190:2-192:128" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14234,6 +14267,7 @@ "locator" : "195:2-197:133" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14651,6 +14685,7 @@ "locator" : "200:2-202:132" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15068,6 +15103,7 @@ "locator" : "205:2-207:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15485,6 +15521,7 @@ "locator" : "210:2-212:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15835,6 +15872,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16052,6 +16090,7 @@ "locator" : "243:2-245:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16438,6 +16477,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16740,6 +16780,7 @@ "locator" : "248:2-250:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17126,6 +17167,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17423,6 +17465,7 @@ "locator" : "238:2-240:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18109,6 +18152,7 @@ "locator" : "299:2-309:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19355,6 +19399,7 @@ "locator" : "321:2-327:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20238,6 +20283,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21115,6 +21161,7 @@ "locator" : "286:2-296:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22361,6 +22408,7 @@ "locator" : "312:2-318:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23244,6 +23292,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23785,6 +23834,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23892,7 +23942,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Hospice-2.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Hospice-2.0.000.json index eace017ae..944c1a8f5 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Hospice-2.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/Hospice-2.0.000.json @@ -521,6 +521,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1585,7 +1586,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IPSSorAUASIChange612MonthsAfterDiagnosisofBenignProstaticHyperplasia-1.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IPSSorAUASIChange612MonthsAfterDiagnosisofBenignProstaticHyperplasia-1.4.000.json index 39ed0ab8e..f73662e35 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IPSSorAUASIChange612MonthsAfterDiagnosisofBenignProstaticHyperplasia-1.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IPSSorAUASIChange612MonthsAfterDiagnosisofBenignProstaticHyperplasia-1.4.000.json @@ -405,6 +405,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -500,6 +501,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -595,6 +597,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -690,6 +693,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1149,6 +1153,7 @@ "locator" : "42:2-52:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2324,6 +2329,7 @@ "locator" : "55:2-60:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2955,6 +2961,7 @@ "locator" : "135:2-137:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3463,6 +3470,7 @@ "locator" : "63:2-67:16" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3976,6 +3984,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4122,6 +4131,7 @@ "locator" : "73:2-74:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4424,6 +4434,7 @@ "locator" : "77:2-78:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4768,6 +4779,7 @@ "locator" : "106:2-110:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5406,6 +5418,7 @@ "locator" : "147:2-151:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5969,6 +5982,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6294,6 +6308,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6475,6 +6490,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Integer" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6867,6 +6883,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7057,6 +7074,7 @@ "name" : "Urinary Symptom Score Improvement Greater Than or Equal To 3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7292,6 +7310,7 @@ "locator" : "118:2-120:133" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7822,6 +7841,7 @@ "locator" : "140:2-144:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8454,6 +8474,7 @@ "locator" : "127:2-132:35" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9034,6 +9055,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9196,6 +9218,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9412,7 +9435,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-8.5.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-8.5.000.json index 717447a77..5bc5e4e4c 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-8.5.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-8.5.000.json @@ -397,6 +397,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -492,6 +493,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -587,6 +589,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +685,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1074,6 +1078,7 @@ "locator" : "93:2-101:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1929,6 +1934,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}Diagnosis" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2633,6 +2639,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3009,6 +3016,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3230,6 +3238,7 @@ "locator" : "49:2-51:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3652,6 +3661,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4085,6 +4095,7 @@ "locator" : "145:2-150:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4822,6 +4833,7 @@ "locator" : "87:2-90:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5302,6 +5314,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5562,6 +5575,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6193,6 +6207,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6602,6 +6617,7 @@ "locator" : "104:2-105:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7146,6 +7162,7 @@ "locator" : "108:2-112:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8026,6 +8043,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8925,6 +8943,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9909,6 +9928,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10817,7 +10837,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IntensiveCareUnitVenousThromboembolismProphylaxis-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IntensiveCareUnitVenousThromboembolismProphylaxis-8.2.000.json index 5483ca6e7..475dc6d35 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IntensiveCareUnitVenousThromboembolismProphylaxis-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/IntensiveCareUnitVenousThromboembolismProphylaxis-8.2.000.json @@ -670,6 +670,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -765,6 +766,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -860,6 +862,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +958,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1127,6 +1131,7 @@ "locator" : "66:2-67:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1438,6 +1443,7 @@ "locator" : "124:2-131:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2077,6 +2083,7 @@ "locator" : "304:2-308:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2540,6 +2547,7 @@ "name" : "Encounter With Age Range and Without VTE Diagnosis or Obstetrical Conditions" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2733,6 +2741,7 @@ "locator" : "73:2-77:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3605,6 +3614,7 @@ "locator" : "80:2-88:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4642,6 +4652,7 @@ "locator" : "91:2-98:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5477,6 +5488,7 @@ "locator" : "101:2-106:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5855,6 +5867,7 @@ "name" : "Encounter With ICU Location" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6059,6 +6072,7 @@ "locator" : "112:2-116:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6638,6 +6652,7 @@ "locator" : "119:2-121:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6978,6 +6993,7 @@ "locator" : "134:2-135:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7316,6 +7332,7 @@ "locator" : "138:2-139:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7927,6 +7944,7 @@ "locator" : "142:2-155:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9414,6 +9432,7 @@ "locator" : "311:2-324:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10816,6 +10835,7 @@ "locator" : "229:2-231:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11346,6 +11366,7 @@ "locator" : "196:2-204:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12077,6 +12098,7 @@ "locator" : "158:2-159:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12416,6 +12438,7 @@ "locator" : "162:2-170:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13478,6 +13501,7 @@ "locator" : "173:2-182:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14521,6 +14545,7 @@ "locator" : "185:2-193:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15603,6 +15628,7 @@ "locator" : "207:2-220:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16894,6 +16920,7 @@ "locator" : "223:2-226:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17425,6 +17452,7 @@ "locator" : "234:2-236:130" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17874,6 +17902,7 @@ "locator" : "239:2-242:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18550,6 +18579,7 @@ "locator" : "245:2-254:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19730,6 +19760,7 @@ "locator" : "288:2-301:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20914,6 +20945,7 @@ "locator" : "268:2-273:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21148,6 +21180,7 @@ "locator" : "276:2-277:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21375,6 +21408,7 @@ "locator" : "257:2-265:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21687,6 +21721,7 @@ "name" : "Encounter With First ICU Location Stay Less Than 1 day" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21867,6 +21902,7 @@ "locator" : "283:2-285:183" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22512,6 +22548,7 @@ "locator" : "340:2-346:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23097,6 +23134,7 @@ "locator" : "327:2-330:141" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23708,6 +23746,7 @@ "locator" : "333:2-336:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23855,7 +23894,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MATGlobalCommonFunctions-4.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MATGlobalCommonFunctions-4.0.000.json index 594e39bb0..81fa7e235 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MATGlobalCommonFunctions-4.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MATGlobalCommonFunctions-4.0.000.json @@ -178,6 +178,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -523,6 +524,7 @@ "locator" : "18:2-20:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -884,6 +886,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -964,6 +967,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1320,6 +1324,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1555,6 +1560,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1721,6 +1727,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1956,6 +1963,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2122,6 +2130,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2357,6 +2366,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2513,6 +2523,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3724,6 +3735,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4274,6 +4286,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4944,6 +4957,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6137,6 +6151,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6289,6 +6304,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6702,6 +6718,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6863,6 +6880,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7276,6 +7294,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7437,6 +7456,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10076,6 +10096,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11981,7 +12002,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MaternalDepressionScreening-7.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MaternalDepressionScreening-7.1.000.json index 5c32e1e1e..6164dbea8 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MaternalDepressionScreening-7.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MaternalDepressionScreening-7.1.000.json @@ -322,6 +322,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -417,6 +418,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -512,6 +514,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -607,6 +610,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -779,6 +783,7 @@ "locator" : "42:2-45:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1111,6 +1116,7 @@ "locator" : "59:2-61:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1649,6 +1655,7 @@ "locator" : "64:2-68:8" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2186,6 +2193,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2300,6 +2308,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2551,6 +2560,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3060,7 +3070,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-8.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-8.0.000.json index f6a68d393..d1e58ce51 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-8.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-8.0.000.json @@ -184,6 +184,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -279,6 +280,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -374,6 +376,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -469,6 +472,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -549,6 +553,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1018,6 +1023,7 @@ "locator" : "58:2-61:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1636,6 +1642,7 @@ "locator" : "34:2-36:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1997,6 +2004,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2133,6 +2141,7 @@ "locator" : "40:2-42:92" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2523,6 +2532,7 @@ "locator" : "46:2-47:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2936,6 +2946,7 @@ "locator" : "51:2-54:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3397,6 +3408,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4326,6 +4338,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4822,6 +4835,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5195,7 +5209,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/OncologyMedicalandRadiationPainIntensityQuantified-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/OncologyMedicalandRadiationPainIntensityQuantified-8.1.000.json index 2f3269ba5..022412a3e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/OncologyMedicalandRadiationPainIntensityQuantified-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/OncologyMedicalandRadiationPainIntensityQuantified-8.1.000.json @@ -237,6 +237,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -332,6 +333,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -427,6 +429,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -522,6 +525,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1102,6 +1106,7 @@ "locator" : "65:2-77:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2224,6 +2229,7 @@ "name" : "Face to Face Encounter with Ongoing Chemotherapy" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2282,6 +2288,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2393,6 +2400,7 @@ "locator" : "38:2-39:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2726,6 +2734,7 @@ "locator" : "42:2-44:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3046,6 +3055,7 @@ "name" : "Radiation Treatment with Cancer Diagnosis" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3104,6 +3114,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3302,6 +3313,7 @@ "locator" : "47:2-50:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3847,6 +3859,7 @@ "locator" : "56:2-59:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4239,7 +4252,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PneumococcalVaccinationStatusforOlderAdults-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PneumococcalVaccinationStatusforOlderAdults-8.1.000.json index 7ec43991d..87f9df908 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PneumococcalVaccinationStatusforOlderAdults-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PneumococcalVaccinationStatusforOlderAdults-8.1.000.json @@ -369,6 +369,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -464,6 +465,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +561,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -654,6 +657,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1046,6 +1050,7 @@ "locator" : "47:2-55:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1816,6 +1821,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2217,6 +2223,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2451,6 +2458,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3006,6 +3014,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3079,7 +3088,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningBodyMassIndexBMIScreeningandFollowUpPlan-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningBodyMassIndexBMIScreeningandFollowUpPlan-8.2.000.json index b1df98842..c46fb4c4e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningBodyMassIndexBMIScreeningandFollowUpPlan-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningBodyMassIndexBMIScreeningandFollowUpPlan-8.2.000.json @@ -426,6 +426,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -521,6 +522,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -616,6 +618,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -711,6 +714,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -961,6 +965,7 @@ "locator" : "174:2-178:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1575,6 +1580,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1663,6 +1669,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1785,6 +1792,7 @@ "locator" : "50:2-51:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2304,6 +2312,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3078,6 +3087,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3829,6 +3839,7 @@ "locator" : "136:2-144:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4909,6 +4920,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5929,6 +5941,7 @@ "locator" : "147:2-155:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7009,6 +7022,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7562,6 +7576,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7896,6 +7911,7 @@ "locator" : "99:2-102:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8559,6 +8575,7 @@ "locator" : "111:2-114:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9310,6 +9327,7 @@ "locator" : "158:2-162:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10053,6 +10071,7 @@ "locator" : "117:2-120:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10804,6 +10823,7 @@ "locator" : "181:2-185:112" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11547,6 +11567,7 @@ "locator" : "105:2-108:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12148,6 +12169,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12730,6 +12752,7 @@ "locator" : "71:2-74:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13188,6 +13211,7 @@ "locator" : "77:2-80:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13708,6 +13732,7 @@ "locator" : "188:2-191:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14107,6 +14132,7 @@ "locator" : "170:2-171:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14265,6 +14291,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14498,7 +14525,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningInfluenzaImmunization-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningInfluenzaImmunization-9.1.000.json index 9965f7c4c..22946862e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningInfluenzaImmunization-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningInfluenzaImmunization-9.1.000.json @@ -628,6 +628,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -723,6 +724,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -818,6 +820,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +916,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1059,6 +1063,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1339,6 +1344,7 @@ "locator" : "62:2-63:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2124,6 +2130,7 @@ "locator" : "66:2-81:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3241,6 +3248,7 @@ "locator" : "84:2-85:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3530,6 +3538,7 @@ "locator" : "88:2-89:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3841,6 +3850,7 @@ "locator" : "92:2-93:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4147,6 +4157,7 @@ "locator" : "96:2-97:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4447,6 +4458,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4732,6 +4744,7 @@ "locator" : "100:2-101:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5021,6 +5034,7 @@ "locator" : "104:2-105:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5332,6 +5346,7 @@ "locator" : "108:2-109:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5643,6 +5658,7 @@ "locator" : "112:2-113:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5949,6 +5965,7 @@ "locator" : "116:2-117:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6255,6 +6272,7 @@ "locator" : "120:2-121:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6651,6 +6669,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7251,6 +7270,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7551,6 +7571,7 @@ "locator" : "131:2-132:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7857,6 +7878,7 @@ "locator" : "135:2-136:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8269,6 +8291,7 @@ "locator" : "139:2-145:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9114,6 +9137,7 @@ "locator" : "164:2-170:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9957,6 +9981,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10436,6 +10461,7 @@ "locator" : "173:2-174:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10726,6 +10752,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10884,7 +10911,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforDepressionandFollowUpPlan-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforDepressionandFollowUpPlan-9.1.000.json index 9d9b125d6..8de8484ef 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforDepressionandFollowUpPlan-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforDepressionandFollowUpPlan-9.1.000.json @@ -490,6 +490,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -585,6 +586,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -680,6 +682,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -775,6 +778,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -945,6 +949,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1329,6 +1334,7 @@ "locator" : "179:2-180:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1583,6 +1589,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1705,6 +1712,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1995,6 +2003,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2590,6 +2599,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2942,6 +2952,7 @@ "locator" : "195:2-197:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3394,6 +3405,7 @@ "locator" : "205:2-207:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3830,6 +3842,7 @@ "locator" : "215:2-217:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4266,6 +4279,7 @@ "locator" : "225:2-227:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4702,6 +4716,7 @@ "locator" : "235:2-237:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5138,6 +5153,7 @@ "locator" : "245:2-247:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5577,6 +5593,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6213,6 +6230,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6808,6 +6826,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7160,6 +7179,7 @@ "locator" : "200:2-202:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7612,6 +7632,7 @@ "locator" : "210:2-212:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8048,6 +8069,7 @@ "locator" : "220:2-222:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8484,6 +8506,7 @@ "locator" : "230:2-232:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8920,6 +8943,7 @@ "locator" : "240:2-242:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9356,6 +9380,7 @@ "locator" : "250:2-252:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9795,6 +9820,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10320,6 +10346,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10881,6 +10908,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11340,6 +11368,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11702,6 +11731,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11850,6 +11880,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12116,6 +12147,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12408,6 +12440,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12827,6 +12860,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13234,6 +13268,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13815,6 +13850,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14539,6 +14575,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15165,6 +15202,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15750,6 +15788,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16335,6 +16374,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16859,6 +16899,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17202,7 +17243,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforHighBloodPressureandFollowUpDocumented-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforHighBloodPressureandFollowUpDocumented-8.2.000.json index 4a6b1f2ac..a66c24f35 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforHighBloodPressureandFollowUpDocumented-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningScreeningforHighBloodPressureandFollowUpDocumented-8.2.000.json @@ -490,6 +490,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -585,6 +586,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -680,6 +682,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -775,6 +778,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -910,6 +914,7 @@ "locator" : "51:2-52:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1433,6 +1438,7 @@ "locator" : "55:2-62:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2217,6 +2223,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveEncounterPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2456,6 +2463,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3110,6 +3118,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3648,6 +3657,7 @@ "locator" : "84:2-85:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3937,6 +3947,7 @@ "locator" : "88:2-93:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4566,6 +4577,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5143,6 +5155,7 @@ "locator" : "100:2-107:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5884,6 +5897,7 @@ "locator" : "110:2-114:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6435,6 +6449,7 @@ "locator" : "117:2-119:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6922,6 +6937,7 @@ "locator" : "122:2-127:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7441,6 +7457,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7945,6 +7962,7 @@ "locator" : "136:2-140:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8496,6 +8514,7 @@ "locator" : "143:2-145:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8920,6 +8939,7 @@ "locator" : "148:2-150:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9443,6 +9463,7 @@ "locator" : "153:2-158:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9932,6 +9953,7 @@ "locator" : "161:2-164:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10503,6 +10525,7 @@ "locator" : "167:2-171:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10835,6 +10858,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11161,6 +11185,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11667,6 +11692,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12069,6 +12095,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12575,6 +12602,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositivePhysicalExamPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12773,6 +12801,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12975,6 +13004,7 @@ "locator" : "203:2-208:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13409,6 +13439,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13616,6 +13647,7 @@ "locator" : "215:2-217:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14084,6 +14116,7 @@ "locator" : "220:2-224:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14602,6 +14635,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14882,6 +14916,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15087,6 +15122,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15564,6 +15600,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16005,6 +16042,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16497,6 +16535,7 @@ "locator" : "249:2-253:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17031,6 +17070,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17369,6 +17409,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17742,6 +17783,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18021,6 +18063,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18279,7 +18322,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningTobaccoUseScreeningandCessationIntervention-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningTobaccoUseScreeningandCessationIntervention-8.1.000.json index f939c1302..35727ebf1 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningTobaccoUseScreeningandCessationIntervention-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PreventiveCareandScreeningTobaccoUseScreeningandCessationIntervention-8.1.000.json @@ -558,6 +558,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -653,6 +654,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +750,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -843,6 +846,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1340,6 +1344,7 @@ "locator" : "57:2-68:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2415,6 +2420,7 @@ "locator" : "71:2-77:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3173,6 +3179,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3922,6 +3929,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveAssessmentPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4604,6 +4612,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5107,6 +5116,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5176,6 +5186,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5273,6 +5284,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5395,6 +5407,7 @@ "locator" : "106:2-107:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5791,6 +5804,7 @@ "locator" : "180:2-183:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6217,6 +6231,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6475,6 +6490,7 @@ "locator" : "164:2-169:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7163,6 +7179,7 @@ "locator" : "172:2-177:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7767,6 +7784,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8016,6 +8034,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8369,6 +8388,7 @@ "locator" : "125:2-129:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8837,6 +8857,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9068,6 +9089,7 @@ "locator" : "157:2-161:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9634,6 +9656,7 @@ "locator" : "150:2-154:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10128,6 +10151,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10399,6 +10423,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10709,7 +10734,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryCariesPreventionInterventionasOfferedbyPrimaryCareProvidersincludingDentists-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryCariesPreventionInterventionasOfferedbyPrimaryCareProvidersincludingDentists-9.1.000.json index 388bdfe3d..e0a084314 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryCariesPreventionInterventionasOfferedbyPrimaryCareProvidersincludingDentists-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryCariesPreventionInterventionasOfferedbyPrimaryCareProvidersincludingDentists-9.1.000.json @@ -327,6 +327,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -422,6 +423,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +519,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -612,6 +615,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -753,6 +757,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1243,6 +1248,7 @@ "locator" : "48:2-54:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1897,6 +1903,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2273,6 +2280,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2320,6 +2328,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2494,6 +2503,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2965,6 +2975,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3623,6 +3634,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4128,7 +4140,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryOpenAngleGlaucomaPOAGOpticNerveEvaluation-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryOpenAngleGlaucomaPOAGOpticNerveEvaluation-8.1.000.json index aa9854692..7469453b5 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryOpenAngleGlaucomaPOAGOpticNerveEvaluation-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/PrimaryOpenAngleGlaucomaPOAGOpticNerveEvaluation-8.1.000.json @@ -348,6 +348,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -443,6 +444,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +540,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -633,6 +636,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -929,6 +933,7 @@ "locator" : "42:2-47:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1510,6 +1515,7 @@ "locator" : "69:2-71:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1970,6 +1976,7 @@ "locator" : "63:2-66:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2515,6 +2522,7 @@ "locator" : "74:2-77:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2950,6 +2958,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3182,6 +3191,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3583,6 +3593,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3754,6 +3765,7 @@ "locator" : "57:2-60:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4303,6 +4315,7 @@ "locator" : "80:2-83:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4763,6 +4776,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4870,7 +4884,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ProstateCancerAvoidanceofOveruseofBoneScanforStagingLowRiskProstateCancerPatients-9.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ProstateCancerAvoidanceofOveruseofBoneScanforStagingLowRiskProstateCancerPatients-9.0.000.json index c2a06b982..7c02a10c7 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ProstateCancerAvoidanceofOveruseofBoneScanforStagingLowRiskProstateCancerPatients-9.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/ProstateCancerAvoidanceofOveruseofBoneScanforStagingLowRiskProstateCancerPatients-9.0.000.json @@ -455,6 +455,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -550,6 +551,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -645,6 +647,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -740,6 +743,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +896,7 @@ "locator" : "45:2-46:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1171,6 +1176,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1422,6 +1428,7 @@ "locator" : "96:2-98:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1867,6 +1874,7 @@ "locator" : "101:2-103:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2312,6 +2320,7 @@ "locator" : "87:2-89:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2694,6 +2703,7 @@ "locator" : "92:2-93:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2958,6 +2968,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3219,6 +3230,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveProcedurePerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3734,6 +3746,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4637,6 +4650,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveProcedurePerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5756,6 +5770,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6413,6 +6428,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6647,6 +6663,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6720,7 +6737,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-3.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-3.1.000.json index a98fa0df7..8f82513fa 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-3.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-3.1.000.json @@ -670,6 +670,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -765,6 +766,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -860,6 +862,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +958,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1189,6 +1193,7 @@ "locator" : "65:2-69:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1593,6 +1598,7 @@ "locator" : "72:2-74:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1878,6 +1884,7 @@ "locator" : "77:2-79:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2133,6 +2140,7 @@ "locator" : "82:2-83:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2597,6 +2605,7 @@ "locator" : "86:2-93:92" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3142,6 +3151,7 @@ "locator" : "96:2-97:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3434,6 +3444,7 @@ "locator" : "100:2-102:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3754,6 +3765,7 @@ "locator" : "105:2-107:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4049,6 +4061,7 @@ "locator" : "110:2-112:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4339,6 +4352,7 @@ "locator" : "115:2-116:58" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4525,6 +4539,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4874,6 +4889,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5001,6 +5017,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5324,6 +5341,7 @@ "locator" : "218:2-222:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5768,6 +5786,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveLaboratoryTestPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5895,6 +5914,7 @@ "resultTypeName" : "{urn:healthit-gov:qdm:v5_4}PositiveLaboratoryTestPerformed" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6169,6 +6189,7 @@ "locator" : "130:2-131:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6495,6 +6516,7 @@ "locator" : "134:2-136:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6744,6 +6766,7 @@ "locator" : "139:2-140:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7025,6 +7048,7 @@ "locator" : "143:2-144:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7337,6 +7361,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7685,6 +7710,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8033,6 +8059,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8391,6 +8418,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8756,6 +8784,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9104,6 +9133,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9505,6 +9535,7 @@ "locator" : "212:2-215:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9926,6 +9957,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10232,6 +10264,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10634,6 +10667,7 @@ "locator" : "207:2-209:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11104,6 +11138,7 @@ "locator" : "258:2-260:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11504,6 +11539,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12148,6 +12184,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12548,6 +12585,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12732,6 +12770,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12923,6 +12962,7 @@ "locator" : "225:2-227:29" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13238,6 +13278,7 @@ "locator" : "230:2-231:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13406,6 +13447,7 @@ "locator" : "263:2-264:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13712,6 +13754,7 @@ "locator" : "267:2-268:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14056,6 +14099,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14494,6 +14538,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14839,7 +14884,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/TJC_Overall-3.6.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/TJC_Overall-3.6.000.json index f279d0730..9a0aeb18b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/TJC_Overall-3.6.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/TJC_Overall-3.6.000.json @@ -425,6 +425,7 @@ "locator" : "30:2-31:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -686,6 +687,7 @@ "locator" : "43:2-45:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1151,6 +1153,7 @@ "locator" : "34:2-36:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1572,6 +1575,7 @@ "locator" : "63:2-65:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2028,6 +2032,7 @@ "locator" : "39:2-40:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2418,6 +2423,7 @@ "locator" : "48:2-55:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3208,6 +3214,7 @@ "locator" : "58:2-60:163" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3627,6 +3634,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3858,6 +3866,7 @@ "name" : "StartValue" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4195,7 +4204,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/UseofHighRiskMedicationsintheElderly-8.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/UseofHighRiskMedicationsintheElderly-8.3.000.json index f9e50ef7b..2a732c3ff 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/UseofHighRiskMedicationsintheElderly-8.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/UseofHighRiskMedicationsintheElderly-8.3.000.json @@ -1867,6 +1867,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1962,6 +1963,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2057,6 +2059,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2152,6 +2155,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2582,6 +2586,7 @@ "locator" : "183:2-192:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3410,6 +3415,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3811,6 +3817,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3858,6 +3865,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3997,6 +4005,7 @@ "locator" : "157:2-158:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4286,6 +4295,7 @@ "locator" : "161:2-162:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4628,6 +4638,7 @@ "locator" : "165:2-168:2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5002,6 +5013,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10799,6 +10811,7 @@ "locator" : "200:2-521:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20161,6 +20174,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20683,6 +20697,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20859,6 +20874,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21084,6 +21100,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21392,6 +21409,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21598,6 +21616,7 @@ "locator" : "175:2-176:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21864,6 +21883,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22021,7 +22041,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VTEICU-3.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VTEICU-3.1.000.json index 66c5ae1d8..190fccafa 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VTEICU-3.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VTEICU-3.1.000.json @@ -121,6 +121,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -635,6 +636,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1305,6 +1307,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1481,6 +1484,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1633,6 +1637,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2098,7 +2103,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VenousThromboembolismProphylaxis-8.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VenousThromboembolismProphylaxis-8.2.000.json index addcf1b5f..cb46f8cdb 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VenousThromboembolismProphylaxis-8.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/VenousThromboembolismProphylaxis-8.2.000.json @@ -712,6 +712,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -807,6 +808,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -902,6 +904,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -997,6 +1000,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1244,6 +1248,7 @@ "locator" : "130:2-137:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1883,6 +1888,7 @@ "locator" : "295:2-299:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2346,6 +2352,7 @@ "name" : "Encounter With Age Range and Without VTE Diagnosis or Obstetrical Conditions" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2404,6 +2411,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2803,6 +2811,7 @@ "locator" : "75:2-80:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3604,6 +3613,7 @@ "locator" : "83:2-90:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4158,6 +4168,7 @@ "locator" : "93:2-94:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4501,6 +4512,7 @@ "locator" : "97:2-98:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5046,6 +5058,7 @@ "locator" : "101:2-109:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5776,6 +5789,7 @@ "locator" : "112:2-115:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6336,6 +6350,7 @@ "locator" : "118:2-122:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6915,6 +6930,7 @@ "locator" : "125:2-127:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7427,6 +7443,7 @@ "locator" : "140:2-145:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8614,6 +8631,7 @@ "locator" : "148:2-161:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10101,6 +10119,7 @@ "locator" : "164:2-177:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11547,6 +11566,7 @@ "locator" : "180:2-183:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12078,6 +12098,7 @@ "locator" : "186:2-188:130" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12483,6 +12504,7 @@ "locator" : "218:2-220:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13018,6 +13040,7 @@ "locator" : "321:2-329:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13741,6 +13764,7 @@ "locator" : "191:2-192:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14072,6 +14096,7 @@ "locator" : "251:2-259:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14795,6 +14820,7 @@ "locator" : "195:2-196:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15016,6 +15042,7 @@ "locator" : "332:2-335:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15697,6 +15724,7 @@ "locator" : "262:2-271:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16757,6 +16785,7 @@ "locator" : "239:2-248:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17630,6 +17659,7 @@ "locator" : "199:2-204:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18221,6 +18251,7 @@ "locator" : "274:2-287:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19702,6 +19733,7 @@ "locator" : "223:2-236:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20983,6 +21015,7 @@ "locator" : "207:2-215:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21417,6 +21450,7 @@ "locator" : "290:2-292:181" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22090,6 +22124,7 @@ "locator" : "302:2-310:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23114,6 +23149,7 @@ "locator" : "339:2-345:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23680,6 +23716,7 @@ "locator" : "348:2-351:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24246,6 +24283,7 @@ "locator" : "313:2-318:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24461,7 +24499,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-8.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-8.1.000.json index cab1406ae..60a6d14ba 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-8.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-8.1.000.json @@ -397,6 +397,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -492,6 +493,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -587,6 +589,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +685,7 @@ "codeProperty" : "code" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1007,6 +1011,7 @@ "locator" : "59:2-65:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1682,6 +1687,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2100,6 +2106,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2242,6 +2249,7 @@ "locator" : "89:2-91:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2653,6 +2661,7 @@ "locator" : "72:2-74:32" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3064,6 +3073,7 @@ "locator" : "54:2-56:32" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3439,6 +3449,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3755,6 +3766,7 @@ "locator" : "68:2-69:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4010,6 +4022,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4231,6 +4244,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4537,6 +4551,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4924,6 +4939,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5582,6 +5598,7 @@ "resultTypeName" : "{urn:hl7-org:elm-types:r1}Boolean" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6087,7 +6104,8 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableDateRangeOptimization,EnableAnnotations,EnableLocators,EnableResultTypes,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" } ] } } diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json index 0fa262605..8a07e2cf2 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdultMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "26:32-26:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -503,6 +520,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +574,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -642,6 +661,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -717,6 +737,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -792,6 +813,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -867,6 +889,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1099,6 +1122,7 @@ "locator" : "53:3-62:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1952,6 +1976,7 @@ "locator" : "46:3-50:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2546,6 +2571,7 @@ "locator" : "70:3-72:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2902,6 +2928,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2998,6 +3025,7 @@ "locator" : "65:3-67:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3298,8 +3326,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Adult_Outpatient_Encounters-1.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Adult_Outpatient_Encounters-1.3.000.json index 6c9a67fda..9b47ae996 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Adult_Outpatient_Encounters-1.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Adult_Outpatient_Encounters-1.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "11:32-11:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -209,6 +214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -230,6 +236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -389,6 +396,7 @@ "locator" : "16:3-21:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,8 +861,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdvancedIllnessandFrailtyExclusionECQM-5.5.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdvancedIllnessandFrailtyExclusionECQM-5.5.000.json index ccb8da03d..34b27d4ab 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdvancedIllnessandFrailtyExclusionECQM-5.5.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AdvancedIllnessandFrailtyExclusionECQM-5.5.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "25:32-25:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -503,6 +520,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -825,6 +843,7 @@ "locator" : "61:3-75:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2296,6 +2315,7 @@ "locator" : "98:3-106:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3141,6 +3161,7 @@ "locator" : "85:3-90:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3726,6 +3747,7 @@ "locator" : "56:3-58:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4313,6 +4335,7 @@ "locator" : "31:3-42:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5490,6 +5513,7 @@ "locator" : "46:3-53:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6177,6 +6201,7 @@ "locator" : "78:3-82:34" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6633,6 +6658,7 @@ "locator" : "93:3-95:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6832,8 +6858,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AnticoagulationTherapyforAtrialFibrillationFlutter-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AnticoagulationTherapyforAtrialFibrillationFlutter-10.2.000.json index eb9b0d4f4..0b4d2f1c7 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AnticoagulationTherapyforAtrialFibrillationFlutter-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AnticoagulationTherapyforAtrialFibrillationFlutter-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -163,6 +166,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -184,6 +188,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -205,6 +210,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -226,6 +232,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -247,6 +254,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -268,6 +276,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -289,6 +298,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -310,6 +320,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -331,6 +342,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -352,6 +364,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -373,6 +386,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -394,6 +408,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -415,6 +430,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -436,6 +452,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +513,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -571,6 +589,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -646,6 +665,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -721,6 +741,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -848,6 +869,7 @@ "locator" : "38:3-40:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1179,6 +1201,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1248,6 +1271,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1385,6 +1409,7 @@ "locator" : "59:3-61:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1766,6 +1791,7 @@ "locator" : "69:3-72:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2142,6 +2168,7 @@ "locator" : "75:3-78:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2509,6 +2536,7 @@ "locator" : "81:3-83:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2662,6 +2690,7 @@ "locator" : "49:3-51:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2984,6 +3013,7 @@ "locator" : "54:3-56:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3329,6 +3359,7 @@ "locator" : "64:3-66:155" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3863,6 +3894,7 @@ "locator" : "86:3-93:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4520,8 +4552,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntidepressantMedicationManagement-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntidepressantMedicationManagement-9.2.000.json index 1d55629cc..ffab6d885 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntidepressantMedicationManagement-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntidepressantMedicationManagement-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +632,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +719,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -772,6 +795,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -847,6 +871,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -922,6 +947,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1171,6 +1197,7 @@ "locator" : "46:3-50:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1836,6 +1863,7 @@ "locator" : "103:3-108:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2641,6 +2669,7 @@ "locator" : "56:3-67:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3645,6 +3674,7 @@ "locator" : "70:3-74:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4078,6 +4108,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4289,6 +4320,7 @@ "locator" : "83:3-87:133" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4928,6 +4960,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5316,6 +5349,7 @@ "locator" : "97:3-97:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5403,6 +5437,7 @@ "name" : "Cumulative Medication Duration Greater Than or Equal to 180 Days" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5614,6 +5649,7 @@ "locator" : "90:3-94:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6256,6 +6292,7 @@ "locator" : "100:3-100:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6343,6 +6380,7 @@ "name" : "Cumulative Medication Duration Greater Than or Equal to 84 Days" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6510,6 +6548,7 @@ "locator" : "111:3-116:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7131,8 +7170,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntithromboticTherapyByEndofHospitalDay2-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntithromboticTherapyByEndofHospitalDay2-9.1.000.json index 29985c4ab..d12067c64 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntithromboticTherapyByEndofHospitalDay2-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AntithromboticTherapyByEndofHospitalDay2-9.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -163,6 +166,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -184,6 +188,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -205,6 +210,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -226,6 +232,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -247,6 +254,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -268,6 +276,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -289,6 +298,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -310,6 +320,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -331,6 +342,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -352,6 +364,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -373,6 +386,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -394,6 +408,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -541,6 +556,7 @@ "locator" : "24:3-27:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1089,6 +1105,7 @@ "locator" : "30:3-32:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1421,6 +1438,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1558,6 +1576,7 @@ "locator" : "38:3-40:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1940,6 +1959,7 @@ "locator" : "52:3-54:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2305,6 +2325,7 @@ "locator" : "43:3-44:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2443,6 +2464,7 @@ "locator" : "47:3-49:165" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2897,6 +2919,7 @@ "locator" : "81:3-83:170" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3304,6 +3327,7 @@ "name" : "Encounter with Antithrombotic Therapy" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3355,6 +3379,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3430,6 +3455,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3505,6 +3531,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3580,6 +3607,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3706,6 +3734,7 @@ "locator" : "72:3-73:95" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3924,6 +3953,7 @@ "locator" : "115:3-118:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4460,6 +4490,7 @@ "locator" : "103:3-105:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4777,6 +4808,7 @@ "locator" : "76:3-78:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4890,6 +4922,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5040,6 +5073,7 @@ "locator" : "110:3-112:188" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5467,6 +5501,7 @@ "locator" : "89:3-91:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5615,6 +5650,7 @@ "locator" : "99:3-100:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5897,6 +5933,7 @@ "locator" : "121:3-123:214" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6400,6 +6437,7 @@ "locator" : "94:3-96:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6506,8 +6544,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTestingforPharyngitis-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTestingforPharyngitis-9.2.000.json index 075291db1..42e1ce435 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTestingforPharyngitis-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTestingforPharyngitis-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "39:32-39:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +622,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -622,6 +644,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -643,6 +666,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +688,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +710,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +732,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +754,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +776,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -769,6 +798,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -800,6 +830,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,6 +884,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1211,6 +1243,7 @@ "locator" : "144:3-159:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2355,6 +2388,7 @@ "locator" : "95:3-97:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2759,6 +2793,7 @@ "locator" : "55:3-57:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2976,6 +3011,7 @@ "locator" : "125:3-128:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3345,6 +3381,7 @@ "locator" : "119:3-122:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3777,6 +3814,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3856,6 +3894,7 @@ "locator" : "47:3-48:52" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4078,6 +4117,7 @@ "locator" : "51:3-52:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4247,6 +4287,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4322,6 +4363,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4397,6 +4439,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4472,6 +4515,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4634,6 +4678,7 @@ "locator" : "72:3-75:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5163,6 +5208,7 @@ "locator" : "78:3-81:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5819,6 +5865,7 @@ "locator" : "84:3-92:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6650,6 +6697,7 @@ "locator" : "100:3-103:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7489,6 +7537,7 @@ "locator" : "106:3-109:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8050,6 +8099,7 @@ "locator" : "112:3-116:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8855,6 +8905,7 @@ "locator" : "131:3-135:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9467,6 +9518,7 @@ "locator" : "138:3-141:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9607,8 +9659,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTreatmentforUpperRespiratoryInfectionURI-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTreatmentforUpperRespiratoryInfectionURI-9.2.000.json index 37f8e46c1..da58b921d 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTreatmentforUpperRespiratoryInfectionURI-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateTreatmentforUpperRespiratoryInfectionURI-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +632,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +719,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -772,6 +795,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -847,6 +871,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -922,6 +947,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1146,6 +1172,7 @@ "locator" : "117:3-125:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1885,6 +1912,7 @@ "locator" : "53:3-57:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2416,6 +2444,7 @@ "locator" : "72:3-75:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2848,6 +2877,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2910,6 +2940,7 @@ "locator" : "49:3-50:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3207,6 +3238,7 @@ "locator" : "60:3-63:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3795,6 +3827,7 @@ "locator" : "66:3-69:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4620,6 +4653,7 @@ "locator" : "78:3-82:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5246,6 +5280,7 @@ "locator" : "85:3-89:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5959,6 +5994,7 @@ "locator" : "92:3-95:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6488,6 +6524,7 @@ "locator" : "98:3-101:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7032,6 +7069,7 @@ "locator" : "110:3-114:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7703,6 +7741,7 @@ "locator" : "104:3-107:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7843,8 +7882,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-3.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-3.2.000.json index 55028f2f5..b96df9734 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-3.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/AppropriateUseofDXAScansinWomenUnder65YearsWhoDoNotMeettheRiskFactorProfileforOsteoporoticFracture-3.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "73:32-73:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +928,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +950,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -934,6 +972,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +994,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -976,6 +1016,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -997,6 +1038,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1018,6 +1060,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1049,6 +1092,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1102,6 +1146,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1155,6 +1200,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1208,6 +1254,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1261,6 +1308,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1314,6 +1362,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1367,6 +1416,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1420,6 +1470,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1473,6 +1524,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1526,6 +1578,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1579,6 +1632,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1632,6 +1686,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1685,6 +1740,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1738,6 +1794,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1791,6 +1848,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1844,6 +1902,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1897,6 +1956,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1950,6 +2010,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2003,6 +2064,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2056,6 +2118,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2109,6 +2172,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2162,6 +2226,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2215,6 +2280,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2301,6 +2367,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2376,6 +2443,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2451,6 +2519,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2526,6 +2595,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2700,6 +2770,7 @@ "locator" : "106:3-111:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3281,6 +3352,7 @@ "locator" : "156:3-159:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3772,6 +3844,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3859,6 +3932,7 @@ "locator" : "93:3-94:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4122,6 +4196,7 @@ "locator" : "97:3-98:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4404,6 +4479,7 @@ "locator" : "101:3-103:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4760,6 +4836,7 @@ "locator" : "114:3-120:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5274,6 +5351,7 @@ "locator" : "123:3-125:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5706,6 +5784,7 @@ "locator" : "128:3-139:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6524,6 +6603,7 @@ "locator" : "225:3-226:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6847,6 +6927,7 @@ "locator" : "218:3-222:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7356,6 +7437,7 @@ "locator" : "204:3-208:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7859,6 +7941,7 @@ "locator" : "211:3-215:4" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8300,6 +8383,7 @@ "locator" : "152:3-153:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8783,6 +8867,7 @@ "locator" : "142:3-149:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9093,6 +9178,7 @@ "name" : "frequency" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11552,6 +11638,7 @@ "name" : "dosesPerDay" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11959,6 +12046,7 @@ "locator" : "238:3-248:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12883,6 +12971,7 @@ "locator" : "186:3-196:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13610,6 +13699,7 @@ "locator" : "199:3-201:8" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14128,6 +14218,7 @@ "locator" : "168:3-183:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15086,6 +15177,7 @@ "locator" : "234:3-235:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15395,6 +15487,7 @@ "locator" : "229:3-231:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15944,6 +16037,7 @@ "locator" : "251:3-257:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16429,6 +16523,7 @@ "locator" : "162:3-165:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16569,8 +16664,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-4.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-4.1.000.json index 5bb79b5a3..62400fcdf 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-4.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Bonedensityevaluationforpatientswithprostatecancerandreceivingandrogendeprivationtherapy-4.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "21:32-21:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -192,6 +196,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -213,6 +218,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -234,6 +240,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -255,6 +262,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -276,6 +284,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -297,6 +306,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -318,6 +328,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -339,6 +350,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -360,6 +372,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +404,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -444,6 +458,7 @@ "name" : "AdministrativeGender" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +553,7 @@ "locator" : "29:3-29:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +680,7 @@ "locator" : "60:3-61:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -947,6 +964,7 @@ "locator" : "32:3-34:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1313,6 +1331,7 @@ "locator" : "49:3-57:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2064,6 +2083,7 @@ "locator" : "64:3-66:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2193,6 +2213,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2244,6 +2265,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2319,6 +2341,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2394,6 +2417,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2469,6 +2493,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2673,6 +2698,7 @@ "locator" : "69:3-75:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3350,6 +3376,7 @@ "locator" : "78:3-84:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3911,6 +3938,7 @@ "locator" : "87:3-88:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4476,6 +4504,7 @@ "locator" : "91:3-101:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5642,6 +5671,7 @@ "name" : "Has Baseline DEXA Scan Two Years Prior to the Start of or Less than Three Months After the Start of ADT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5680,8 +5710,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/BreastCancerScreening-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/BreastCancerScreening-9.2.000.json index 981121755..ef2a0f135 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/BreastCancerScreening-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/BreastCancerScreening-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -204,6 +208,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -264,6 +269,7 @@ "locator" : "31:32-31:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -330,6 +336,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -351,6 +358,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -376,6 +384,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -397,6 +406,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -418,6 +428,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -439,6 +450,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -460,6 +472,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -481,6 +494,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -502,6 +516,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -523,6 +538,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -544,6 +560,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -565,6 +582,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -586,6 +604,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -607,6 +626,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -628,6 +648,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -659,6 +680,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -712,6 +734,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -765,6 +788,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -956,6 +980,7 @@ "locator" : "39:3-42:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1481,6 +1506,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1532,6 +1558,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1607,6 +1634,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1682,6 +1710,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1757,6 +1786,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1925,6 +1955,7 @@ "locator" : "102:3-107:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2504,6 +2535,7 @@ "locator" : "89:3-91:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2832,6 +2864,7 @@ "locator" : "94:3-99:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3368,6 +3401,7 @@ "locator" : "74:3-76:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3651,6 +3685,7 @@ "locator" : "79:3-81:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3935,6 +3970,7 @@ "locator" : "84:3-86:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4358,6 +4394,7 @@ "locator" : "57:3-71:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5512,6 +5549,7 @@ "locator" : "110:3-114:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5853,8 +5891,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CADBetaBlockerTherapyPriorMIorLVSD-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CADBetaBlockerTherapyPriorMIorLVSD-9.2.000.json index 0c1821e5d..29a59ee76 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CADBetaBlockerTherapyPriorMIorLVSD-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CADBetaBlockerTherapyPriorMIorLVSD-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "47:32-47:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +928,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +950,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -944,6 +982,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -997,6 +1036,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1182,6 +1222,7 @@ "locator" : "227:3-232:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1700,6 +1741,7 @@ "locator" : "160:3-162:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2064,6 +2106,7 @@ "locator" : "235:3-238:52" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2397,6 +2440,7 @@ "locator" : "284:3-285:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2643,6 +2687,7 @@ "locator" : "309:3-315:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3260,6 +3305,7 @@ "locator" : "318:3-323:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3780,6 +3826,7 @@ "locator" : "52:3-55:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4366,6 +4413,7 @@ "locator" : "326:3-333:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5231,6 +5279,7 @@ "locator" : "58:3-61:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5659,6 +5708,7 @@ "locator" : "64:3-66:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6013,6 +6063,7 @@ "locator" : "69:3-71:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6367,6 +6418,7 @@ "locator" : "74:3-76:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6721,6 +6773,7 @@ "locator" : "79:3-81:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7075,6 +7128,7 @@ "locator" : "84:3-86:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7429,6 +7483,7 @@ "locator" : "217:3-219:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7784,6 +7839,7 @@ "locator" : "124:3-126:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8135,6 +8191,7 @@ "locator" : "89:3-91:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8380,6 +8437,7 @@ "locator" : "94:3-96:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8734,6 +8792,7 @@ "locator" : "222:3-224:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9089,6 +9148,7 @@ "locator" : "129:3-131:97" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9440,6 +9500,7 @@ "locator" : "99:3-101:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9686,6 +9747,7 @@ "locator" : "104:3-106:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10041,6 +10103,7 @@ "locator" : "109:3-111:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10395,6 +10458,7 @@ "locator" : "114:3-116:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10749,6 +10813,7 @@ "locator" : "119:3-121:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11270,6 +11335,7 @@ "locator" : "134:3-144:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12486,6 +12552,7 @@ "locator" : "147:3-157:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13535,6 +13602,7 @@ "locator" : "165:3-167:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13889,6 +13957,7 @@ "locator" : "170:3-172:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14317,6 +14386,7 @@ "locator" : "288:3-294:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14947,6 +15017,7 @@ "locator" : "251:3-255:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15463,6 +15534,7 @@ "locator" : "175:3-176:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15573,6 +15645,7 @@ "locator" : "179:3-180:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15716,6 +15789,7 @@ "locator" : "241:3-243:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16087,6 +16161,7 @@ "locator" : "205:3-208:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16578,6 +16653,7 @@ "locator" : "258:3-264:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17343,6 +17419,7 @@ "locator" : "183:3-191:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17843,6 +17920,7 @@ "locator" : "246:3-248:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18214,6 +18292,7 @@ "locator" : "211:3-214:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18705,6 +18784,7 @@ "locator" : "267:3-273:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19470,6 +19550,7 @@ "locator" : "194:3-202:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19942,6 +20023,7 @@ "locator" : "276:3-277:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20074,6 +20156,7 @@ "locator" : "280:3-281:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20193,6 +20276,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20268,6 +20352,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20343,6 +20428,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20418,6 +20504,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20480,8 +20567,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CRLReceiptofSpecialistReport-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CRLReceiptofSpecialistReport-9.2.000.json index 4150d9654..48beaef35 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CRLReceiptofSpecialistReport-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CRLReceiptofSpecialistReport-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "18:32-18:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -209,6 +214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -230,6 +236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -251,6 +258,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -272,6 +280,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -293,6 +302,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -314,6 +324,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -335,6 +346,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -356,6 +368,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -377,6 +390,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -552,6 +566,7 @@ "locator" : "26:3-32:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1222,6 +1237,7 @@ "locator" : "54:3-62:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2057,6 +2073,7 @@ "locator" : "35:3-36:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2169,6 +2186,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2220,6 +2238,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2295,6 +2314,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2370,6 +2390,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2445,6 +2466,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2584,6 +2606,7 @@ "locator" : "65:3-68:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3031,6 +3054,7 @@ "locator" : "51:3-51:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3086,8 +3110,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Cataracts2040BCVAwithin90Days-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Cataracts2040BCVAwithin90Days-9.2.000.json index 09d94252f..efb702c5c 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Cataracts2040BCVAwithin90Days-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Cataracts2040BCVAwithin90Days-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "76:32-76:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +928,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +950,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -934,6 +972,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +994,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -976,6 +1016,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -997,6 +1038,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1018,6 +1060,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1039,6 +1082,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1060,6 +1104,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1081,6 +1126,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1102,6 +1148,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1123,6 +1170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1144,6 +1192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1165,6 +1214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1186,6 +1236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1207,6 +1258,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1228,6 +1280,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1249,6 +1302,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1270,6 +1324,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1291,6 +1346,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1312,6 +1368,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1333,6 +1390,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1354,6 +1412,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1375,6 +1434,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1396,6 +1456,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1417,6 +1478,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1438,6 +1500,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1459,6 +1522,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1480,6 +1544,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1501,6 +1566,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1522,6 +1588,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1553,6 +1620,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1606,6 +1674,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1692,6 +1761,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1767,6 +1837,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1842,6 +1913,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1917,6 +1989,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2061,6 +2134,7 @@ "locator" : "98:3-101:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2520,6 +2594,7 @@ "locator" : "93:3-95:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2876,6 +2951,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3834,6 +3910,7 @@ "locator" : "107:3-163:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7440,6 +7517,7 @@ "locator" : "166:3-171:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7974,8 +8052,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CervicalCancerScreening-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CervicalCancerScreening-9.1.000.json index 949c45af0..a17c3e1ad 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CervicalCancerScreening-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/CervicalCancerScreening-9.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "27:32-27:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -548,6 +566,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +620,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -768,6 +788,7 @@ "locator" : "35:3-39:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1291,6 +1312,7 @@ "locator" : "78:3-82:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1807,6 +1829,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1858,6 +1881,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1933,6 +1957,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2008,6 +2033,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2083,6 +2109,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2285,6 +2312,7 @@ "locator" : "54:3-61:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2913,6 +2941,7 @@ "locator" : "64:3-67:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3441,6 +3470,7 @@ "locator" : "70:3-75:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4113,6 +4143,7 @@ "locator" : "85:3-86:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4241,6 +4272,7 @@ "locator" : "89:3-90:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4364,8 +4396,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json index 5aaf83b4c..907c36b84 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessment-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "27:32-27:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -524,6 +542,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +596,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -663,6 +683,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -738,6 +759,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -813,6 +835,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -888,6 +911,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1157,6 +1181,7 @@ "locator" : "53:3-64:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2136,6 +2161,7 @@ "locator" : "47:3-50:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2679,6 +2705,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2775,6 +2802,7 @@ "locator" : "67:3-69:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3075,8 +3103,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildhoodImmunizationStatus-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildhoodImmunizationStatus-9.2.000.json index 3a3360d2e..5b6fbf1ba 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildhoodImmunizationStatus-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildhoodImmunizationStatus-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "82:32-82:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -282,6 +288,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +622,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -622,6 +644,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -643,6 +666,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +688,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +710,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +732,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +754,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +776,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -769,6 +798,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -790,6 +820,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -811,6 +842,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -832,6 +864,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,6 +886,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -874,6 +908,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -895,6 +930,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -916,6 +952,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -937,6 +974,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -958,6 +996,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -979,6 +1018,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1000,6 +1040,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1021,6 +1062,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1042,6 +1084,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1063,6 +1106,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1084,6 +1128,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1105,6 +1150,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1126,6 +1172,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1147,6 +1194,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1168,6 +1216,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1189,6 +1238,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1210,6 +1260,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1231,6 +1282,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1252,6 +1304,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1273,6 +1326,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1294,6 +1348,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1315,6 +1370,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1336,6 +1392,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1357,6 +1414,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1378,6 +1436,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1399,6 +1458,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1420,6 +1480,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1441,6 +1502,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1462,6 +1524,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1483,6 +1546,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1514,6 +1578,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1567,6 +1632,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1620,6 +1686,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1673,6 +1740,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1726,6 +1794,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1779,6 +1848,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1832,6 +1902,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1885,6 +1956,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1938,6 +2010,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1991,6 +2064,7 @@ "name" : "CVX" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2044,6 +2118,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2211,6 +2286,7 @@ "locator" : "93:3-97:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2738,6 +2814,7 @@ "locator" : "240:3-245:41" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3349,6 +3426,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3394,6 +3472,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3608,6 +3687,7 @@ "locator" : "201:3-204:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4248,6 +4328,7 @@ "locator" : "207:3-210:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4765,6 +4846,7 @@ "locator" : "100:3-101:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4850,6 +4932,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4925,6 +5008,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5000,6 +5084,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5075,6 +5160,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5205,6 +5291,7 @@ "locator" : "368:3-370:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5708,6 +5795,7 @@ "locator" : "116:3-130:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6687,6 +6775,7 @@ "locator" : "189:3-192:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7344,6 +7433,7 @@ "locator" : "133:3-141:35" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8305,6 +8395,7 @@ "locator" : "171:3-174:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8874,6 +8965,7 @@ "locator" : "144:3-148:26" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9379,6 +9471,7 @@ "locator" : "195:3-198:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9992,6 +10085,7 @@ "locator" : "151:3-157:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10725,6 +10819,7 @@ "locator" : "177:3-180:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11382,6 +11477,7 @@ "locator" : "160:3-168:27" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12332,6 +12428,7 @@ "locator" : "183:3-186:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12911,6 +13008,7 @@ "locator" : "213:3-219:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13633,6 +13731,7 @@ "locator" : "222:3-225:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14228,6 +14327,7 @@ "locator" : "228:3-231:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14823,6 +14923,7 @@ "locator" : "234:3-237:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15518,6 +15619,7 @@ "locator" : "248:3-257:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16943,6 +17045,7 @@ "locator" : "260:3-272:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18478,6 +18581,7 @@ "locator" : "275:3-279:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19232,6 +19336,7 @@ "locator" : "282:3-287:130" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20114,6 +20219,7 @@ "locator" : "290:3-299:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21300,6 +21406,7 @@ "locator" : "302:3-303:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21853,6 +21960,7 @@ "locator" : "306:3-310:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22572,6 +22680,7 @@ "locator" : "313:3-317:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23363,6 +23472,7 @@ "locator" : "320:3-329:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24907,6 +25017,7 @@ "locator" : "332:3-353:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27272,6 +27383,7 @@ "locator" : "356:3-365:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -28472,6 +28584,7 @@ "locator" : "373:3-375:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -29095,6 +29208,7 @@ "locator" : "445:3-448:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -29735,6 +29849,7 @@ "locator" : "451:3-454:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -30252,6 +30367,7 @@ "locator" : "383:3-384:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -30392,6 +30508,7 @@ "locator" : "378:3-380:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -30801,6 +30918,7 @@ "locator" : "387:3-388:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -31390,6 +31508,7 @@ "locator" : "391:3-406:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -32561,6 +32680,7 @@ "locator" : "409:3-442:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -34504,8 +34624,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildrenWhoHaveDentalDecayorCavities-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildrenWhoHaveDentalDecayorCavities-9.2.000.json index 0788c006c..b4a113cb7 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildrenWhoHaveDentalDecayorCavities-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChildrenWhoHaveDentalDecayorCavities-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "19:32-19:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -401,6 +412,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -487,6 +499,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -562,6 +575,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -637,6 +651,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -712,6 +727,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -816,6 +832,7 @@ "locator" : "47:3-48:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1153,6 +1170,7 @@ "locator" : "51:3-55:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1764,6 +1782,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1848,6 +1867,7 @@ "locator" : "39:3-41:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2113,6 +2133,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2185,8 +2206,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChlamydiaScreeningforWomen-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChlamydiaScreeningforWomen-9.2.000.json index db8fc1fdc..69f21e5d0 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChlamydiaScreeningforWomen-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ChlamydiaScreeningforWomen-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "48:32-48:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +622,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -622,6 +644,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -643,6 +666,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +688,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +710,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +732,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +754,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +776,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -769,6 +798,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -790,6 +820,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -811,6 +842,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -832,6 +864,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,6 +886,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -874,6 +908,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -895,6 +930,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -916,6 +952,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -937,6 +974,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -958,6 +996,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -989,6 +1028,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1042,6 +1082,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1243,6 +1284,7 @@ "locator" : "166:3-172:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1837,6 +1879,7 @@ "locator" : "88:3-92:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2368,6 +2411,7 @@ "locator" : "95:3-105:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3130,6 +3174,7 @@ "locator" : "84:3-85:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3388,6 +3433,7 @@ "locator" : "118:3-119:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3682,6 +3728,7 @@ "locator" : "112:3-115:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4082,6 +4129,7 @@ "locator" : "134:3-136:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4390,6 +4438,7 @@ "locator" : "108:3-109:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4684,6 +4733,7 @@ "locator" : "175:3-178:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5254,6 +5304,7 @@ "locator" : "151:3-163:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6352,6 +6403,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6403,6 +6455,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6478,6 +6531,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6553,6 +6607,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6628,6 +6683,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6757,6 +6813,7 @@ "locator" : "68:3-71:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7180,6 +7237,7 @@ "locator" : "74:3-76:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7619,6 +7677,7 @@ "locator" : "79:3-81:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8226,6 +8285,7 @@ "locator" : "122:3-131:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9404,6 +9464,7 @@ "locator" : "139:3-148:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10228,8 +10289,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ColorectalCancerScreening-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ColorectalCancerScreening-9.2.000.json index 76e33b0cf..696ca698d 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ColorectalCancerScreening-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ColorectalCancerScreening-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -204,6 +208,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -264,6 +269,7 @@ "locator" : "26:32-26:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -330,6 +336,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -355,6 +362,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -376,6 +384,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -397,6 +406,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -418,6 +428,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -439,6 +450,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -460,6 +472,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -481,6 +494,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -502,6 +516,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -523,6 +538,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -544,6 +560,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -565,6 +582,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -596,6 +614,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +701,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -757,6 +777,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -832,6 +853,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -907,6 +929,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1065,6 +1088,7 @@ "locator" : "89:3-92:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1515,6 +1539,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1649,6 +1674,7 @@ "locator" : "69:3-71:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1985,6 +2011,7 @@ "locator" : "59:3-61:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2382,6 +2409,7 @@ "locator" : "79:3-81:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2772,6 +2800,7 @@ "locator" : "53:3-56:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3235,6 +3264,7 @@ "locator" : "74:3-76:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3580,6 +3610,7 @@ "locator" : "46:3-50:41" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3889,6 +3920,7 @@ "locator" : "64:3-66:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4169,6 +4201,7 @@ "locator" : "84:3-86:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4532,6 +4565,7 @@ "locator" : "95:3-102:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5205,8 +5239,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ControllingHighBloodPressure-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ControllingHighBloodPressure-9.2.000.json index 16678b511..d482f2944 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ControllingHighBloodPressure-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ControllingHighBloodPressure-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -204,6 +208,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -264,6 +269,7 @@ "locator" : "32:32-32:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -330,6 +336,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -355,6 +362,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -376,6 +384,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -397,6 +406,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -418,6 +428,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -439,6 +450,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -460,6 +472,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -481,6 +494,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -502,6 +516,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -523,6 +538,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -544,6 +560,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -565,6 +582,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -586,6 +604,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -607,6 +626,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -628,6 +648,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -649,6 +670,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -680,6 +702,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -733,6 +756,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -786,6 +810,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -872,6 +897,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -947,6 +973,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1022,6 +1049,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1097,6 +1125,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1288,6 +1317,7 @@ "locator" : "108:3-114:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2063,6 +2093,7 @@ "locator" : "117:3-123:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2781,6 +2812,7 @@ "locator" : "93:3-99:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3229,6 +3261,7 @@ "locator" : "139:3-141:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3414,6 +3447,7 @@ "locator" : "81:3-84:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3767,6 +3801,7 @@ "locator" : "75:3-75:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3944,6 +3979,7 @@ "locator" : "87:3-90:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4297,6 +4333,7 @@ "locator" : "78:3-78:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4419,6 +4456,7 @@ "locator" : "49:3-50:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4581,6 +4619,7 @@ "locator" : "53:3-57:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5062,6 +5101,7 @@ "locator" : "144:3-146:32" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5507,6 +5547,7 @@ "locator" : "102:3-105:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5983,6 +6024,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6072,6 +6114,7 @@ "locator" : "63:3-65:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6392,6 +6435,7 @@ "locator" : "68:3-72:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6902,6 +6946,7 @@ "locator" : "126:3-136:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7751,8 +7796,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DRCommunicationWithPhysicianManagingDiabetes-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DRCommunicationWithPhysicianManagingDiabetes-9.2.000.json index 315be1571..f6d197990 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DRCommunicationWithPhysicianManagingDiabetes-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DRCommunicationWithPhysicianManagingDiabetes-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -566,6 +586,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +640,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -705,6 +727,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -780,6 +803,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -855,6 +879,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -930,6 +955,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1104,6 +1130,7 @@ "locator" : "78:3-83:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1622,6 +1649,7 @@ "locator" : "73:3-75:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2020,6 +2048,7 @@ "locator" : "46:3-51:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2652,6 +2681,7 @@ "locator" : "54:3-59:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3284,6 +3314,7 @@ "locator" : "111:3-116:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3862,6 +3893,7 @@ "locator" : "62:3-64:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4101,6 +4133,7 @@ "locator" : "67:3-70:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4565,6 +4598,7 @@ "locator" : "119:3-122:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4979,6 +5013,7 @@ "locator" : "86:3-87:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5131,6 +5166,7 @@ "locator" : "90:3-92:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5508,6 +5544,7 @@ "locator" : "95:3-97:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5885,6 +5922,7 @@ "locator" : "100:3-102:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6243,6 +6281,7 @@ "locator" : "105:3-108:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6425,8 +6464,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DementiaCognitiveAssessment-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DementiaCognitiveAssessment-9.2.000.json index ac0b96eab..c8fa910cc 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DementiaCognitiveAssessment-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DementiaCognitiveAssessment-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "24:32-24:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -209,6 +214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -230,6 +236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -251,6 +258,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -272,6 +280,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -293,6 +302,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -314,6 +324,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -335,6 +346,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -356,6 +368,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -377,6 +390,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -398,6 +412,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -419,6 +434,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -440,6 +456,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -461,6 +478,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -482,6 +500,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -503,6 +522,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -730,6 +750,7 @@ "locator" : "37:3-46:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1480,6 +1501,7 @@ "locator" : "29:3-31:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1976,6 +1998,7 @@ "locator" : "56:3-66:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2767,6 +2790,7 @@ "locator" : "49:3-50:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2930,6 +2954,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3146,6 +3171,7 @@ "locator" : "84:3-89:48" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3682,6 +3708,7 @@ "locator" : "53:3-53:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3750,6 +3777,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3825,6 +3853,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3900,6 +3929,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3975,6 +4005,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4160,6 +4191,7 @@ "locator" : "92:3-96:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4655,6 +4687,7 @@ "locator" : "81:3-81:114" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4710,8 +4743,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DepressionRemissionatTwelveMonths-9.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DepressionRemissionatTwelveMonths-9.4.000.json index 7aed45d07..5f18453c1 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DepressionRemissionatTwelveMonths-9.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DepressionRemissionatTwelveMonths-9.4.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -566,6 +586,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +640,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -705,6 +727,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -780,6 +803,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -855,6 +879,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -930,6 +955,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1039,6 +1065,7 @@ "locator" : "79:3-80:41" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1268,6 +1295,7 @@ "locator" : "83:3-84:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1438,6 +1466,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1708,6 +1737,7 @@ "locator" : "87:3-90:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2237,6 +2267,7 @@ "locator" : "114:3-120:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3002,6 +3033,7 @@ "locator" : "49:3-53:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3468,6 +3500,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3607,6 +3640,7 @@ "locator" : "123:3-124:181" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4153,6 +4187,7 @@ "locator" : "93:3-96:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4484,6 +4519,7 @@ "locator" : "139:3-142:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4815,6 +4851,7 @@ "locator" : "108:3-111:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5144,6 +5181,7 @@ "locator" : "127:3-130:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5523,6 +5561,7 @@ "locator" : "99:3-105:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6034,6 +6073,7 @@ "locator" : "56:3-60:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6318,6 +6358,7 @@ "locator" : "63:3-67:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7006,6 +7047,7 @@ "locator" : "70:3-73:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7502,6 +7544,7 @@ "locator" : "133:3-136:14" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7905,8 +7948,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesEyeExam-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesEyeExam-9.2.000.json index feeead8fc..dd6cf5f43 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesEyeExam-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesEyeExam-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -219,6 +223,7 @@ "locator" : "27:32-27:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -285,6 +290,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -310,6 +316,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -331,6 +338,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -352,6 +360,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -373,6 +382,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -394,6 +404,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -415,6 +426,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -436,6 +448,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -457,6 +470,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -478,6 +492,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -499,6 +514,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -520,6 +536,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -541,6 +558,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -562,6 +580,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -593,6 +612,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -679,6 +699,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -754,6 +775,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +851,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -904,6 +927,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1094,6 +1118,7 @@ "locator" : "69:3-75:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1761,6 +1786,7 @@ "locator" : "60:3-66:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2456,6 +2482,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2540,6 +2567,7 @@ "locator" : "47:3-49:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2840,6 +2868,7 @@ "locator" : "78:3-79:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3136,6 +3165,7 @@ "locator" : "82:3-84:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3495,6 +3525,7 @@ "locator" : "52:3-57:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3911,6 +3942,7 @@ "locator" : "87:3-92:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4482,8 +4514,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesHemoglobinA1cHbA1cPoorControl9-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesHemoglobinA1cHbA1cPoorControl9-9.3.000.json index c9b4e5359..1bb9c3cef 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesHemoglobinA1cHbA1cPoorControl9-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesHemoglobinA1cHbA1cPoorControl9-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -204,6 +208,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -264,6 +269,7 @@ "locator" : "21:32-21:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -330,6 +336,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -355,6 +362,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -376,6 +384,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -397,6 +406,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -418,6 +428,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -439,6 +450,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -460,6 +472,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -491,6 +504,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +591,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -652,6 +667,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +743,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -802,6 +819,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1010,6 +1028,7 @@ "locator" : "46:3-52:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1739,6 +1758,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1836,6 +1856,7 @@ "locator" : "68:3-71:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2164,6 +2185,7 @@ "locator" : "77:3-78:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2331,6 +2353,7 @@ "locator" : "74:3-74:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2489,6 +2512,7 @@ "locator" : "55:3-57:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2790,6 +2814,7 @@ "locator" : "41:3-43:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2996,6 +3021,7 @@ "locator" : "60:3-65:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3567,8 +3593,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesMedicalAttentionforNephropathy-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesMedicalAttentionforNephropathy-9.3.000.json index 636149295..e875d944f 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesMedicalAttentionforNephropathy-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DiabetesMedicalAttentionforNephropathy-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -204,6 +208,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -264,6 +269,7 @@ "locator" : "33:32-33:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -330,6 +336,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -355,6 +362,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -376,6 +384,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -397,6 +406,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -418,6 +428,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -439,6 +450,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -460,6 +472,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -481,6 +494,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -502,6 +516,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -523,6 +538,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -544,6 +560,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -565,6 +582,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -586,6 +604,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -607,6 +626,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -628,6 +648,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -649,6 +670,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -670,6 +692,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -691,6 +714,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -712,6 +736,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -743,6 +768,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +855,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -904,6 +931,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -979,6 +1007,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1054,6 +1083,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1166,6 +1196,7 @@ "locator" : "50:3-53:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1401,6 +1432,7 @@ "locator" : "56:3-57:59" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1628,6 +1660,7 @@ "locator" : "60:3-65:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2238,6 +2271,7 @@ "locator" : "90:3-96:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2967,6 +3001,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3046,6 +3081,7 @@ "locator" : "71:3-72:46" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3258,6 +3294,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3361,6 +3398,7 @@ "locator" : "107:3-108:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3755,6 +3793,7 @@ "locator" : "83:3-87:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4106,6 +4145,7 @@ "locator" : "78:3-80:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4438,6 +4478,7 @@ "locator" : "99:3-104:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5009,8 +5050,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonAntithromboticTherapy-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonAntithromboticTherapy-9.1.000.json index a82699280..325d5201d 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonAntithromboticTherapy-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonAntithromboticTherapy-9.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -163,6 +166,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -184,6 +188,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -205,6 +210,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -226,6 +232,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -247,6 +254,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -268,6 +276,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -289,6 +298,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -310,6 +320,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +381,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -445,6 +457,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -520,6 +533,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -595,6 +609,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -671,6 +686,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -740,6 +756,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -860,6 +877,7 @@ "locator" : "38:3-40:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1200,6 +1218,7 @@ "locator" : "43:3-45:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1524,6 +1543,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1644,6 +1664,7 @@ "locator" : "55:3-57:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1975,6 +1996,7 @@ "locator" : "60:3-62:92" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2291,6 +2313,7 @@ "locator" : "51:3-52:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2381,6 +2404,7 @@ "locator" : "65:3-66:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2521,8 +2545,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonStatinMedication-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonStatinMedication-9.1.000.json index eafdf1206..2338a6739 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonStatinMedication-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DischargedonStatinMedication-9.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -163,6 +166,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -184,6 +188,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -205,6 +210,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -226,6 +232,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -247,6 +254,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -268,6 +276,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -289,6 +298,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -310,6 +320,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -331,6 +342,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +403,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -466,6 +479,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -541,6 +555,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -616,6 +631,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -691,6 +707,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -767,6 +784,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -894,6 +912,7 @@ "locator" : "39:3-41:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1218,6 +1237,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1297,6 +1317,7 @@ "libraryName" : "TJC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1417,6 +1438,7 @@ "locator" : "50:3-52:92" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1834,6 +1856,7 @@ "locator" : "55:3-60:17" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2667,6 +2690,7 @@ "locator" : "63:3-72:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3332,6 +3356,7 @@ "locator" : "75:3-76:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3472,8 +3497,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DocumentationofCurrentMedications-10.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DocumentationofCurrentMedications-10.3.000.json index 1a0f1d9db..6c5e116c8 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DocumentationofCurrentMedications-10.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/DocumentationofCurrentMedications-10.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "20:32-20:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -377,6 +388,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +442,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -516,6 +529,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -591,6 +605,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -666,6 +681,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -741,6 +757,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -845,6 +862,7 @@ "locator" : "58:3-59:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1172,6 +1190,7 @@ "locator" : "37:3-40:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1620,6 +1639,7 @@ "locator" : "43:3-45:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1976,6 +1996,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2147,6 +2168,7 @@ "locator" : "51:3-55:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2623,8 +2645,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ExclusiveBreastMilkFeeding-9.5.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ExclusiveBreastMilkFeeding-9.5.000.json index eef647555..4b7ed7faa 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ExclusiveBreastMilkFeeding-9.5.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ExclusiveBreastMilkFeeding-9.5.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "27:32-27:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -545,6 +564,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -631,6 +651,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +727,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -781,6 +803,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -856,6 +879,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -984,6 +1008,7 @@ "locator" : "55:3-58:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1409,6 +1434,7 @@ "locator" : "109:3-112:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1952,6 +1978,7 @@ "locator" : "100:3-106:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2707,6 +2734,7 @@ "locator" : "95:3-97:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2955,6 +2983,7 @@ "name" : "Single Live Term Newborn Encounter During Measurement Period" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2999,6 +3028,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3137,6 +3167,7 @@ "locator" : "79:3-83:92" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3663,6 +3694,7 @@ "name" : "Single Live Term Newborn Encounter With Newborn Fed Breast Milk Only Since Birth" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3825,6 +3857,7 @@ "locator" : "86:3-92:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4489,6 +4522,7 @@ "locator" : "75:3-76:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4843,6 +4877,7 @@ "locator" : "64:3-72:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5531,6 +5566,7 @@ "locator" : "50:3-52:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5637,8 +5673,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FallsScreeningforFutureFallRisk-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FallsScreeningforFutureFallRisk-9.2.000.json index 348431b2f..b2dda1046 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FallsScreeningforFutureFallRisk-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FallsScreeningforFutureFallRisk-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +632,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -898,6 +920,7 @@ "locator" : "46:3-57:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1792,6 +1815,7 @@ "locator" : "40:3-43:37" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2191,6 +2215,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2236,6 +2261,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2321,6 +2347,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2396,6 +2423,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2471,6 +2499,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2546,6 +2575,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2655,6 +2685,7 @@ "locator" : "72:3-73:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2888,8 +2919,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FollowUpCareforChildrenPrescribedADHDMedicationADD-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FollowUpCareforChildrenPrescribedADHDMedicationADD-10.2.000.json index 08449ec64..a699b7a16 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FollowUpCareforChildrenPrescribedADHDMedicationADD-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FollowUpCareforChildrenPrescribedADHDMedicationADD-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "39:32-39:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +622,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -622,6 +644,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -643,6 +666,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +688,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +710,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +732,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +754,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +776,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -769,6 +798,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -800,6 +830,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,6 +884,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -939,6 +971,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1014,6 +1047,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1089,6 +1123,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1164,6 +1199,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1320,6 +1356,7 @@ "locator" : "62:3-66:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1907,6 +1944,7 @@ "locator" : "135:3-139:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2498,6 +2536,7 @@ "locator" : "103:3-106:55" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2965,6 +3004,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3103,6 +3143,7 @@ "locator" : "124:3-126:134" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3467,6 +3508,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3898,6 +3940,7 @@ "locator" : "89:3-89:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4103,6 +4146,7 @@ "locator" : "178:3-182:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4604,6 +4648,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4691,6 +4736,7 @@ "locator" : "69:3-71:28" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5182,6 +5228,7 @@ "locator" : "158:3-175:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6358,6 +6405,7 @@ "locator" : "185:3-187:183" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6823,6 +6871,7 @@ "locator" : "74:3-74:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7014,6 +7063,7 @@ "locator" : "149:3-155:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7660,6 +7710,7 @@ "locator" : "114:3-116:118" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8082,6 +8133,7 @@ "locator" : "119:3-121:121" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8483,6 +8535,7 @@ "locator" : "77:3-80:59" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8876,6 +8929,7 @@ "locator" : "109:3-111:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9252,6 +9306,7 @@ "locator" : "83:3-86:59" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9644,6 +9699,7 @@ "locator" : "129:3-132:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10148,6 +10204,7 @@ "locator" : "142:3-146:122" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10808,6 +10865,7 @@ "locator" : "92:3-97:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11160,6 +11218,7 @@ "locator" : "100:3-100:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11240,8 +11299,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalHipReplacement-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalHipReplacement-9.2.000.json index 05694e3f2..8d7db7fc8 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalHipReplacement-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalHipReplacement-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "37:32-37:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -282,6 +288,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +522,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +576,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -612,6 +630,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -665,6 +684,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -718,6 +738,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -771,6 +792,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -824,6 +846,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -877,6 +900,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -930,6 +954,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -983,6 +1008,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1036,6 +1062,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1089,6 +1116,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1142,6 +1170,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1195,6 +1224,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1281,6 +1311,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1356,6 +1387,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1431,6 +1463,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1506,6 +1539,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1654,6 +1688,7 @@ "locator" : "67:3-71:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2144,6 +2179,7 @@ "locator" : "195:3-196:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2518,6 +2554,7 @@ "locator" : "74:3-78:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2976,6 +3013,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3063,6 +3101,7 @@ "locator" : "57:3-59:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3460,6 +3499,7 @@ "locator" : "122:3-126:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3972,6 +4012,7 @@ "locator" : "62:3-64:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4462,6 +4503,7 @@ "locator" : "81:3-96:174" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6259,6 +6301,7 @@ "locator" : "99:3-101:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6619,6 +6662,7 @@ "locator" : "104:3-110:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7444,6 +7488,7 @@ "locator" : "113:3-119:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8300,6 +8345,7 @@ "locator" : "129:3-136:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9150,6 +9196,7 @@ "locator" : "139:3-146:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10033,6 +10080,7 @@ "locator" : "186:3-192:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10889,6 +10937,7 @@ "locator" : "149:3-156:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11735,6 +11784,7 @@ "locator" : "159:3-166:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12581,6 +12631,7 @@ "locator" : "169:3-176:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13305,6 +13356,7 @@ "locator" : "179:3-183:75" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13604,8 +13656,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalKneeReplacement-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalKneeReplacement-9.3.000.json index 3e37f07a6..bd79b5702 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalKneeReplacement-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentforTotalKneeReplacement-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "37:32-37:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -282,6 +288,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +522,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +576,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -612,6 +630,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -665,6 +684,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -718,6 +738,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -771,6 +792,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -824,6 +846,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -877,6 +900,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -930,6 +954,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -983,6 +1008,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1036,6 +1062,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1089,6 +1116,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1142,6 +1170,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1195,6 +1224,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1281,6 +1311,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1356,6 +1387,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1431,6 +1463,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1506,6 +1539,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1617,6 +1651,7 @@ "locator" : "54:3-56:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1961,6 +1996,7 @@ "locator" : "67:3-71:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2450,6 +2486,7 @@ "locator" : "81:3-82:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2824,6 +2861,7 @@ "locator" : "74:3-78:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3282,6 +3320,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3456,6 +3495,7 @@ "locator" : "85:3-89:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3951,6 +3991,7 @@ "locator" : "62:3-64:31" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4441,6 +4482,7 @@ "locator" : "92:3-107:174" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6334,6 +6376,7 @@ "locator" : "110:3-116:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7159,6 +7202,7 @@ "locator" : "119:3-125:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7888,6 +7932,7 @@ "locator" : "128:3-130:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8248,6 +8293,7 @@ "locator" : "133:3-139:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9104,6 +9150,7 @@ "locator" : "142:3-149:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9950,6 +9997,7 @@ "locator" : "152:3-159:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10796,6 +10844,7 @@ "locator" : "169:3-176:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11646,6 +11695,7 @@ "locator" : "179:3-186:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12560,6 +12610,7 @@ "locator" : "189:3-196:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13284,6 +13335,7 @@ "locator" : "162:3-166:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13458,8 +13510,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentsforCongestiveHeartFailure-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentsforCongestiveHeartFailure-10.2.000.json index b2c182c2e..885228bbf 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentsforCongestiveHeartFailure-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/FunctionalStatusAssessmentsforCongestiveHeartFailure-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "49:32-49:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -261,6 +266,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -422,6 +434,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +488,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -528,6 +542,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -581,6 +596,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -634,6 +650,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -687,6 +704,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -740,6 +758,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -793,6 +812,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -846,6 +866,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -899,6 +920,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -952,6 +974,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1005,6 +1028,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1058,6 +1082,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1111,6 +1136,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1164,6 +1190,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1217,6 +1244,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1270,6 +1298,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1323,6 +1352,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1376,6 +1406,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1429,6 +1460,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1482,6 +1514,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1535,6 +1568,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1588,6 +1622,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1641,6 +1676,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1694,6 +1730,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1747,6 +1784,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1800,6 +1838,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1853,6 +1892,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1906,6 +1946,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1959,6 +2000,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2074,6 +2116,7 @@ "locator" : "193:3-194:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2370,6 +2413,7 @@ "locator" : "161:3-165:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2869,6 +2913,7 @@ "locator" : "63:3-68:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3545,6 +3590,7 @@ "locator" : "168:3-174:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4223,6 +4269,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4321,6 +4368,7 @@ "locator" : "57:3-60:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5068,6 +5116,7 @@ "locator" : "209:3-227:229" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7553,6 +7602,7 @@ "locator" : "71:3-77:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8275,6 +8325,7 @@ "locator" : "177:3-178:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8856,6 +8907,7 @@ "locator" : "80:3-86:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9807,6 +9859,7 @@ "locator" : "230:3-236:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10868,6 +10921,7 @@ "locator" : "89:3-95:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11683,6 +11737,7 @@ "locator" : "239:3-245:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12744,6 +12799,7 @@ "locator" : "98:3-104:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13559,6 +13615,7 @@ "locator" : "248:3-254:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14620,6 +14677,7 @@ "locator" : "107:3-113:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15790,6 +15848,7 @@ "locator" : "257:3-278:259" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18631,6 +18690,7 @@ "locator" : "116:3-122:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19446,6 +19506,7 @@ "locator" : "281:3-287:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20507,6 +20568,7 @@ "locator" : "125:3-131:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21322,6 +21384,7 @@ "locator" : "290:3-296:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22383,6 +22446,7 @@ "locator" : "134:3-140:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -23198,6 +23262,7 @@ "locator" : "299:3-305:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -24259,6 +24324,7 @@ "locator" : "143:3-149:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -25074,6 +25140,7 @@ "locator" : "308:3-314:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -26135,6 +26202,7 @@ "locator" : "152:3-158:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -26909,6 +26977,7 @@ "locator" : "181:3-190:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27516,6 +27585,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27591,6 +27661,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27666,6 +27737,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27741,6 +27813,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -27803,8 +27876,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFACEIorARBorARNIforLVSD-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFACEIorARBorARNIforLVSD-9.2.000.json index c73159b1c..556c5c26b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFACEIorARBorARNIforLVSD-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFACEIorARBorARNIforLVSD-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "44:32-44:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -237,6 +242,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -818,6 +850,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +904,7 @@ "name" : "RXNORM" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -924,6 +958,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -977,6 +1012,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1030,6 +1066,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1182,6 +1219,7 @@ "locator" : "121:3-124:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1792,6 +1830,7 @@ "locator" : "150:3-156:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2409,6 +2448,7 @@ "locator" : "197:3-203:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3012,6 +3052,7 @@ "locator" : "49:3-55:137" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3709,6 +3750,7 @@ "locator" : "127:3-134:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4476,6 +4518,7 @@ "locator" : "188:3-194:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5079,6 +5122,7 @@ "locator" : "58:3-64:138" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5755,6 +5799,7 @@ "locator" : "167:3-173:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6385,6 +6430,7 @@ "locator" : "137:3-141:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6876,6 +6922,7 @@ "locator" : "67:3-68:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7047,6 +7094,7 @@ "locator" : "144:3-147:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7461,6 +7509,7 @@ "locator" : "71:3-72:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7689,6 +7738,7 @@ "locator" : "236:3-243:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8501,6 +8551,7 @@ "locator" : "95:3-98:143" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8929,6 +8980,7 @@ "locator" : "106:3-108:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9283,6 +9335,7 @@ "locator" : "116:3-118:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9654,6 +9707,7 @@ "locator" : "75:3-79:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10052,6 +10106,7 @@ "locator" : "226:3-233:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10864,6 +10919,7 @@ "locator" : "89:3-92:142" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11292,6 +11348,7 @@ "locator" : "101:3-103:107" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11646,6 +11703,7 @@ "locator" : "111:3-113:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12017,6 +12075,7 @@ "locator" : "82:3-86:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12331,6 +12390,7 @@ "locator" : "211:3-213:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12685,6 +12745,7 @@ "locator" : "221:3-223:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13011,6 +13072,7 @@ "locator" : "159:3-160:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13172,6 +13234,7 @@ "locator" : "206:3-208:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13526,6 +13589,7 @@ "locator" : "216:3-218:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13852,6 +13916,7 @@ "locator" : "163:3-164:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13971,6 +14036,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14046,6 +14112,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14121,6 +14188,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14196,6 +14264,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14258,8 +14327,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFBetaBlockerTherapyforLVSD-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFBetaBlockerTherapyforLVSD-9.2.000.json index dbc26fabc..b0dc49865 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFBetaBlockerTherapyforLVSD-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HFBetaBlockerTherapyforLVSD-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "45:32-45:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -902,6 +938,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +992,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1107,6 +1145,7 @@ "locator" : "207:3-210:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1717,6 +1756,7 @@ "locator" : "247:3-253:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2334,6 +2374,7 @@ "locator" : "315:3-321:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2879,6 +2920,7 @@ "locator" : "50:3-53:133" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3402,6 +3444,7 @@ "locator" : "285:3-292:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4169,6 +4212,7 @@ "locator" : "324:3-330:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4714,6 +4758,7 @@ "locator" : "56:3-59:134" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5142,6 +5187,7 @@ "locator" : "62:3-64:108" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5496,6 +5542,7 @@ "locator" : "67:3-69:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5850,6 +5897,7 @@ "locator" : "72:3-74:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6204,6 +6252,7 @@ "locator" : "77:3-79:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6558,6 +6607,7 @@ "locator" : "82:3-84:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6912,6 +6962,7 @@ "locator" : "87:3-89:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7266,6 +7317,7 @@ "locator" : "197:3-199:125" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7621,6 +7673,7 @@ "locator" : "122:3-124:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7972,6 +8025,7 @@ "locator" : "92:3-94:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8217,6 +8271,7 @@ "locator" : "202:3-204:126" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8572,6 +8627,7 @@ "locator" : "127:3-129:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8923,6 +8979,7 @@ "locator" : "97:3-99:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9169,6 +9226,7 @@ "locator" : "102:3-104:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9524,6 +9582,7 @@ "locator" : "107:3-109:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9878,6 +9937,7 @@ "locator" : "112:3-114:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10232,6 +10292,7 @@ "locator" : "117:3-119:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10753,6 +10814,7 @@ "locator" : "132:3-142:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11802,6 +11864,7 @@ "locator" : "145:3-147:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12156,6 +12219,7 @@ "locator" : "150:3-152:120" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12584,6 +12648,7 @@ "locator" : "264:3-270:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13214,6 +13279,7 @@ "locator" : "295:3-299:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13705,6 +13771,7 @@ "locator" : "155:3-156:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13876,6 +13943,7 @@ "locator" : "223:3-226:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14290,6 +14358,7 @@ "locator" : "159:3-160:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14600,6 +14669,7 @@ "locator" : "302:3-312:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15712,6 +15782,7 @@ "locator" : "238:3-244:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16405,6 +16476,7 @@ "locator" : "218:3-220:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16776,6 +16848,7 @@ "locator" : "191:3-194:145" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17276,6 +17349,7 @@ "locator" : "163:3-171:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17839,6 +17913,7 @@ "locator" : "229:3-235:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18532,6 +18607,7 @@ "locator" : "213:3-215:109" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18903,6 +18979,7 @@ "locator" : "185:3-188:144" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19403,6 +19480,7 @@ "locator" : "174:3-182:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19875,6 +19953,7 @@ "locator" : "256:3-257:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20007,6 +20086,7 @@ "locator" : "260:3-261:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20126,6 +20206,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20201,6 +20282,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20276,6 +20358,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20351,6 +20434,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20413,8 +20497,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HIVScreening-3.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HIVScreening-3.3.000.json index 6cba35071..2dee8d64a 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HIVScreening-3.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/HIVScreening-3.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "24:32-24:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -461,6 +476,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +530,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -600,6 +617,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -675,6 +693,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -750,6 +769,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -825,6 +845,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1035,6 +1056,7 @@ "locator" : "49:3-55:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1725,6 +1747,7 @@ "locator" : "41:3-41:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1860,6 +1883,7 @@ "locator" : "44:3-46:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2247,6 +2271,7 @@ "locator" : "64:3-69:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2806,6 +2831,7 @@ "locator" : "58:3-61:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3222,6 +3248,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3260,8 +3287,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Hospice-2.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Hospice-2.2.000.json index fcc279f8a..0493defd4 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Hospice-2.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/Hospice-2.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "13:32-13:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -171,6 +174,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -192,6 +196,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -223,6 +228,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -276,6 +282,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -544,6 +551,7 @@ "locator" : "18:3-29:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1539,8 +1547,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-9.3.000.json index 115786fd8..490e4d50e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/InitiationandEngagementofAlcoholandOtherDrugDependenceTreatment-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +632,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +719,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -772,6 +795,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -847,6 +871,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -922,6 +947,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1146,6 +1172,7 @@ "locator" : "53:3-61:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1910,6 +1937,7 @@ "locator" : "131:3-137:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2575,6 +2603,7 @@ "locator" : "71:3-73:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2949,6 +2978,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3100,6 +3130,7 @@ "locator" : "76:3-78:128" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3505,6 +3536,7 @@ "locator" : "49:3-50:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3745,6 +3777,7 @@ "locator" : "148:3-151:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4360,6 +4393,7 @@ "locator" : "64:3-68:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5058,6 +5092,7 @@ "locator" : "140:3-145:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5796,6 +5831,7 @@ "locator" : "81:3-86:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6552,6 +6588,7 @@ "locator" : "89:3-94:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7191,6 +7228,7 @@ "locator" : "97:3-100:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7617,6 +7655,7 @@ "locator" : "103:3-106:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8001,6 +8040,7 @@ "locator" : "109:3-110:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8470,6 +8510,7 @@ "locator" : "113:3-124:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9403,6 +9444,7 @@ "locator" : "127:3-128:58" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9509,8 +9551,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/IntensiveCareUnitVenousThromboembolismProphylaxis-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/IntensiveCareUnitVenousThromboembolismProphylaxis-9.3.000.json index 7dd2c8504..5d317be76 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/IntensiveCareUnitVenousThromboembolismProphylaxis-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/IntensiveCareUnitVenousThromboembolismProphylaxis-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -208,6 +212,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -233,6 +238,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -254,6 +260,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -275,6 +282,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -296,6 +304,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -317,6 +326,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -338,6 +348,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -359,6 +370,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -380,6 +392,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -401,6 +414,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -422,6 +436,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -443,6 +458,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -464,6 +480,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -485,6 +502,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +524,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -527,6 +546,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -548,6 +568,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -569,6 +590,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -590,6 +612,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +634,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -632,6 +656,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -653,6 +678,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -674,6 +700,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -695,6 +722,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -716,6 +744,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -737,6 +766,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -758,6 +788,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -779,6 +810,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -800,6 +832,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -821,6 +854,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -842,6 +876,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -863,6 +898,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -884,6 +920,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -905,6 +942,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -926,6 +964,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -947,6 +986,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -968,6 +1008,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -999,6 +1040,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1052,6 +1094,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1233,6 +1276,7 @@ "locator" : "242:3-249:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1906,6 +1950,7 @@ "locator" : "60:3-64:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2429,6 +2474,7 @@ "locator" : "71:3-75:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2888,6 +2934,7 @@ "name" : "Encounter With ICU Location" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2974,6 +3021,7 @@ "locator" : "67:3-68:98" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3238,6 +3286,7 @@ "name" : "Encounter With First ICU Location Stay Less Than 1 day" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3318,6 +3367,7 @@ "locator" : "78:3-79:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3615,6 +3665,7 @@ "locator" : "153:3-154:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3804,6 +3855,7 @@ "locator" : "82:3-84:189" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4352,6 +4404,7 @@ "locator" : "87:3-94:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5433,6 +5486,7 @@ "locator" : "304:3-327:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6975,6 +7029,7 @@ "locator" : "330:3-332:138" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7406,6 +7461,7 @@ "locator" : "335:3-342:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8109,6 +8165,7 @@ "locator" : "97:3-98:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8400,6 +8457,7 @@ "locator" : "101:3-113:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9906,6 +9964,7 @@ "locator" : "345:3-354:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10565,6 +10624,7 @@ "locator" : "197:3-200:134" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11197,6 +11257,7 @@ "locator" : "157:3-162:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11624,6 +11685,7 @@ "locator" : "165:3-168:131" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12179,6 +12241,7 @@ "locator" : "203:3-211:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13121,6 +13184,7 @@ "locator" : "171:3-179:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13946,6 +14010,7 @@ "locator" : "116:3-121:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14225,6 +14290,7 @@ "locator" : "214:3-216:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14519,6 +14585,7 @@ "locator" : "182:3-184:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14950,6 +15017,7 @@ "locator" : "187:3-194:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15653,6 +15721,7 @@ "locator" : "124:3-125:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15807,6 +15876,7 @@ "locator" : "128:3-132:50" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -16491,6 +16561,7 @@ "locator" : "268:3-277:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17340,6 +17411,7 @@ "locator" : "135:3-147:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18438,6 +18510,7 @@ "name" : "Encounter With Age Range and Without VTE Diagnosis or Obstetrical Conditions" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18668,6 +18741,7 @@ "locator" : "252:3-265:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19749,6 +19823,7 @@ "locator" : "219:3-227:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20054,6 +20129,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20129,6 +20205,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20204,6 +20281,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20279,6 +20357,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20459,6 +20538,7 @@ "locator" : "293:3-299:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20962,6 +21042,7 @@ "locator" : "286:3-289:150" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21508,6 +21589,7 @@ "locator" : "280:3-283:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21648,8 +21730,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MATGlobalCommonFunctions-5.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MATGlobalCommonFunctions-5.0.000.json index 0b462912b..9ae60fd5f 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MATGlobalCommonFunctions-5.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MATGlobalCommonFunctions-5.0.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "13:32-13:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -209,6 +214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -230,6 +236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -292,6 +299,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -566,6 +574,7 @@ "locator" : "18:3-20:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -907,6 +916,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -988,6 +998,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1214,6 +1225,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1374,6 +1386,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1600,6 +1613,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1760,6 +1774,7 @@ "name" : "AsOf" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1986,6 +2001,7 @@ "name" : "BirthDateTime" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2137,6 +2153,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3194,6 +3211,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3693,6 +3711,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4751,6 +4770,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4892,6 +4912,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5263,6 +5284,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5413,6 +5435,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5784,6 +5807,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5934,6 +5958,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8300,6 +8325,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10012,6 +10038,7 @@ "name" : "Value" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10343,6 +10370,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10493,6 +10521,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11093,8 +11122,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-9.1.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-9.1.000.json index fc1b65fd5..218c098cd 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-9.1.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/MedianAdmitDecisionTimetoEDDepartureTimeforAdmittedPatients-9.1.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -118,6 +120,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -139,6 +142,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -160,6 +164,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -181,6 +186,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -202,6 +208,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -223,6 +230,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -244,6 +252,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +274,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +296,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +318,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -364,6 +376,7 @@ "name" : "EncounterInpatient" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -938,6 +951,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1535,6 +1549,7 @@ "name" : "EncounterInpatient" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2354,6 +2369,7 @@ "name" : "EncounterInpatient" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3221,6 +3237,7 @@ "locator" : "61:3-71:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4119,6 +4136,7 @@ "name" : "ED Encounter with Decision to Admit" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4163,6 +4181,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4214,6 +4233,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4289,6 +4309,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4364,6 +4385,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4439,6 +4461,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4582,6 +4605,7 @@ "locator" : "40:3-44:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5070,6 +5094,7 @@ "locator" : "48:3-52:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5536,6 +5561,7 @@ "locator" : "56:3-57:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5761,6 +5787,7 @@ "name" : "EncounterInpatient" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6259,8 +6286,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/OncologyPainIntensityQuantified-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/OncologyPainIntensityQuantified-9.2.000.json index a323f9c8f..ba05ac71b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/OncologyPainIntensityQuantified-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/OncologyPainIntensityQuantified-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "15:32-15:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -209,6 +214,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -230,6 +236,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -251,6 +258,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -272,6 +280,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -293,6 +302,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -314,6 +324,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -447,6 +458,7 @@ "locator" : "62:3-64:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1120,6 +1132,7 @@ "locator" : "67:3-79:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2178,6 +2191,7 @@ "name" : "Face to Face Encounter with Ongoing Chemotherapy" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2222,6 +2236,7 @@ "name" : "Initial Population 1" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2339,6 +2354,7 @@ "locator" : "44:3-47:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2781,6 +2797,7 @@ "name" : "Radiation Treatment Management During Measurement Period with Cancer Diagnosis" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2825,6 +2842,7 @@ "name" : "Initial Population 2" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2938,6 +2956,7 @@ "locator" : "32:3-35:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3398,6 +3417,7 @@ "locator" : "38:3-41:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3796,6 +3816,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3871,6 +3892,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3946,6 +3968,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4021,6 +4044,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4083,8 +4107,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSBMIScreenAndFollowUp-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSBMIScreenAndFollowUp-9.3.000.json index 50f931b47..ebeac8ad5 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSBMIScreenAndFollowUp-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSBMIScreenAndFollowUp-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "33:32-33:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -237,6 +242,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -608,6 +630,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +684,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -714,6 +738,7 @@ "name" : "ICD10CM" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -767,6 +792,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -882,6 +908,7 @@ "locator" : "131:3-132:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1178,6 +1205,7 @@ "locator" : "66:3-69:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1610,6 +1638,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2007,6 +2036,7 @@ "locator" : "72:3-81:61" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2902,6 +2932,7 @@ "locator" : "84:3-89:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3482,6 +3513,7 @@ "locator" : "41:3-42:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3815,6 +3847,7 @@ "locator" : "112:3-124:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4776,6 +4809,7 @@ "locator" : "127:3-128:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5013,6 +5047,7 @@ "locator" : "45:3-46:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5260,6 +5295,7 @@ "locator" : "92:3-98:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5952,6 +5988,7 @@ "locator" : "49:3-53:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6738,6 +6775,7 @@ "locator" : "56:3-63:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7567,6 +7605,7 @@ "locator" : "101:3-102:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8023,6 +8062,7 @@ "locator" : "147:3-154:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8955,6 +8995,7 @@ "locator" : "157:3-161:45" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9616,6 +9657,7 @@ "locator" : "105:3-109:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9888,6 +9930,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9963,6 +10006,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10038,6 +10082,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10113,6 +10158,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10175,8 +10221,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSDepressionScreenAndFollowUp-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSDepressionScreenAndFollowUp-10.2.000.json index da672c4b2..a58114f1d 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSDepressionScreenAndFollowUp-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCSDepressionScreenAndFollowUp-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "32:32-32:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -608,6 +630,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +684,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -714,6 +738,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -854,6 +879,7 @@ "locator" : "153:3-154:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1231,6 +1257,7 @@ "locator" : "165:3-167:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1542,6 +1569,7 @@ "locator" : "68:3-69:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1662,6 +1690,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1798,6 +1827,7 @@ "locator" : "72:3-77:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2475,6 +2505,7 @@ "locator" : "198:3-202:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3058,6 +3089,7 @@ "locator" : "80:3-85:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3735,6 +3767,7 @@ "locator" : "191:3-195:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4276,6 +4309,7 @@ "locator" : "40:3-45:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4654,6 +4688,7 @@ "locator" : "48:3-50:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4952,6 +4987,7 @@ "locator" : "53:3-55:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5282,6 +5318,7 @@ "locator" : "88:3-93:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5849,6 +5886,7 @@ "locator" : "58:3-60:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6233,6 +6271,7 @@ "locator" : "109:3-114:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6800,6 +6839,7 @@ "locator" : "63:3-65:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7257,6 +7297,7 @@ "locator" : "96:3-106:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8308,6 +8349,7 @@ "locator" : "117:3-127:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9201,6 +9243,7 @@ "locator" : "149:3-150:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9585,6 +9628,7 @@ "locator" : "157:3-158:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9969,6 +10013,7 @@ "locator" : "161:3-162:104" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10412,6 +10457,7 @@ "locator" : "130:3-146:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11021,6 +11067,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11096,6 +11143,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11171,6 +11219,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11246,6 +11295,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11426,6 +11476,7 @@ "locator" : "182:3-185:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11811,6 +11862,7 @@ "locator" : "188:3-188:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11866,8 +11918,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_BPScreeningFollowUp-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_BPScreeningFollowUp-9.3.000.json index 4ab68c88b..006711a3e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_BPScreeningFollowUp-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_BPScreeningFollowUp-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "35:32-35:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -629,6 +652,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +706,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -735,6 +760,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -788,6 +814,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -841,6 +868,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -956,6 +984,7 @@ "locator" : "232:3-233:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1446,6 +1475,7 @@ "locator" : "171:3-184:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3027,6 +3057,7 @@ "locator" : "187:3-200:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4356,6 +4387,7 @@ "locator" : "40:3-41:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4666,6 +4698,7 @@ "locator" : "203:3-213:88" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6036,6 +6069,7 @@ "locator" : "216:3-229:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7466,6 +7500,7 @@ "locator" : "162:3-168:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8092,6 +8127,7 @@ "locator" : "92:3-94:102" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8492,6 +8528,7 @@ "locator" : "112:3-115:83" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8927,6 +8964,7 @@ "locator" : "83:3-84:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9060,6 +9098,7 @@ "locator" : "97:3-99:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9438,6 +9477,7 @@ "locator" : "107:3-109:103" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9840,6 +9880,7 @@ "locator" : "156:3-159:90" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10292,6 +10333,7 @@ "locator" : "102:3-104:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10753,6 +10795,7 @@ "locator" : "44:3-68:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11530,6 +11573,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11605,6 +11649,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11680,6 +11725,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11755,6 +11801,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11891,6 +11938,7 @@ "locator" : "87:3-89:110" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12866,6 +12914,7 @@ "locator" : "118:3-132:100" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14068,6 +14117,7 @@ "locator" : "135:3-141:93" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14704,6 +14754,7 @@ "locator" : "144:3-145:79" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14830,6 +14881,7 @@ "locator" : "148:3-150:96" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15136,6 +15188,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15174,8 +15227,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_Tobacco_ScreeningIntervention-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_Tobacco_ScreeningIntervention-9.2.000.json index e657b1eec..b764f3e27 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_Tobacco_ScreeningIntervention-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PCS_Tobacco_ScreeningIntervention-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "41:32-41:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -797,6 +828,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +882,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -903,6 +936,7 @@ "name" : "CPT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -989,6 +1023,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1064,6 +1099,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1139,6 +1175,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1214,6 +1251,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1404,6 +1442,7 @@ "locator" : "58:3-64:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2146,6 +2185,7 @@ "locator" : "133:3-144:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3066,6 +3106,7 @@ "locator" : "73:3-78:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3567,6 +3608,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3611,6 +3653,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3713,6 +3756,7 @@ "locator" : "81:3-83:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4095,6 +4139,7 @@ "locator" : "86:3-88:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4477,6 +4522,7 @@ "locator" : "91:3-93:76" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4837,6 +4883,7 @@ "locator" : "96:3-97:84" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5094,6 +5141,7 @@ "locator" : "100:3-101:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5352,6 +5400,7 @@ "locator" : "104:3-105:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5609,6 +5658,7 @@ "locator" : "108:3-110:60" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5812,6 +5862,7 @@ "locator" : "113:3-115:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6091,6 +6142,7 @@ "locator" : "118:3-119:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6216,6 +6268,7 @@ "locator" : "122:3-124:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6407,6 +6460,7 @@ "locator" : "127:3-130:36" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6690,6 +6744,7 @@ "locator" : "147:3-151:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7243,6 +7298,7 @@ "locator" : "154:3-158:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7729,6 +7785,7 @@ "locator" : "161:3-162:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7852,6 +7909,7 @@ "locator" : "165:3-166:77" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8037,6 +8095,7 @@ "locator" : "169:3-175:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8346,8 +8405,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/POAGOpticNerveEvaluation-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/POAGOpticNerveEvaluation-9.2.000.json index 0ee520b05..02a0763b9 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/POAGOpticNerveEvaluation-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/POAGOpticNerveEvaluation-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "25:32-25:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -503,6 +520,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -589,6 +607,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +683,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -739,6 +759,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -814,6 +835,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -988,6 +1010,7 @@ "locator" : "42:3-47:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1506,6 +1529,7 @@ "locator" : "59:3-61:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1888,6 +1912,7 @@ "locator" : "74:3-77:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2287,6 +2312,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2398,6 +2424,7 @@ "locator" : "53:3-56:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2881,6 +2908,7 @@ "locator" : "64:3-67:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3317,6 +3345,7 @@ "locator" : "70:3-71:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3494,6 +3523,7 @@ "locator" : "80:3-83:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3958,6 +3988,7 @@ "locator" : "86:3-89:51" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4377,6 +4408,7 @@ "locator" : "92:3-93:54" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4483,8 +4515,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PneumococcalVaccinationStatusforOlderAdults-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PneumococcalVaccinationStatusforOlderAdults-9.2.000.json index 55dbc6ee1..11897454e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PneumococcalVaccinationStatusforOlderAdults-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PneumococcalVaccinationStatusforOlderAdults-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "27:32-27:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -569,6 +588,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -655,6 +675,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -730,6 +751,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -805,6 +827,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -880,6 +903,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1104,6 +1128,7 @@ "locator" : "47:3-55:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1824,6 +1849,7 @@ "locator" : "61:3-64:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2223,6 +2249,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2268,6 +2295,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2448,6 +2476,7 @@ "locator" : "67:3-74:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2994,8 +3023,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PreventiveCareandScreeningInfluenzaImmunization-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PreventiveCareandScreeningInfluenzaImmunization-10.2.000.json index a707b9c58..9fade488e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PreventiveCareandScreeningInfluenzaImmunization-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PreventiveCareandScreeningInfluenzaImmunization-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "45:32-45:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +928,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -923,6 +960,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1009,6 +1047,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1084,6 +1123,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1159,6 +1199,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1234,6 +1275,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1346,6 +1388,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1577,6 +1620,7 @@ "locator" : "62:3-63:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1834,6 +1878,7 @@ "locator" : "66:3-67:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2096,6 +2141,7 @@ "locator" : "70:3-71:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2353,6 +2399,7 @@ "locator" : "74:3-75:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2610,6 +2657,7 @@ "locator" : "78:3-79:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3108,6 +3156,7 @@ "locator" : "164:3-179:72" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4194,6 +4243,7 @@ "locator" : "152:3-153:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4452,6 +4502,7 @@ "locator" : "156:3-157:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4780,6 +4831,7 @@ "locator" : "182:3-188:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5342,6 +5394,7 @@ "locator" : "148:3-149:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5600,6 +5653,7 @@ "locator" : "160:3-161:80" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5867,6 +5921,7 @@ "locator" : "82:3-86:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6124,6 +6179,7 @@ "locator" : "89:3-90:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6381,6 +6437,7 @@ "locator" : "93:3-94:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6647,6 +6704,7 @@ "lowClosed" : true }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6967,6 +7025,7 @@ "locator" : "97:3-103:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7746,6 +7805,7 @@ "locator" : "122:3-128:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8511,6 +8571,7 @@ "locator" : "106:3-113:59" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8965,6 +9026,7 @@ "locator" : "144:3-145:116" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9223,6 +9285,7 @@ "locator" : "136:3-137:124" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9481,6 +9544,7 @@ "locator" : "140:3-141:127" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9738,6 +9802,7 @@ "locator" : "131:3-133:53" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9895,8 +9960,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PrimaryCariesPreventionasOfferedbyPCPsincludingDentists-10.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PrimaryCariesPreventionasOfferedbyPCPsincludingDentists-10.2.000.json index 22aefb384..bc8c8fc44 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PrimaryCariesPreventionasOfferedbyPCPsincludingDentists-10.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/PrimaryCariesPreventionasOfferedbyPCPsincludingDentists-10.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "24:32-24:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +522,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -592,6 +609,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -667,6 +685,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -742,6 +761,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -817,6 +837,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1007,6 +1028,7 @@ "locator" : "44:3-50:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1650,6 +1672,7 @@ "locator" : "70:3-74:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2261,6 +2284,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2306,6 +2330,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2459,6 +2484,7 @@ "locator" : "56:3-57:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2873,6 +2899,7 @@ "locator" : "60:3-61:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3313,6 +3340,7 @@ "locator" : "64:3-67:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3889,6 +3917,7 @@ "locator" : "77:3-79:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4147,8 +4176,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ProstateCaAvoidanceBoneScanOveruse-10.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ProstateCaAvoidanceBoneScanOveruse-10.3.000.json index b76fab096..53f58e718 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ProstateCaAvoidanceBoneScanOveruse-10.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/ProstateCaAvoidanceBoneScanOveruse-10.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "28:32-28:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -192,6 +196,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -213,6 +218,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -234,6 +240,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -255,6 +262,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -276,6 +284,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -297,6 +306,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -318,6 +328,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -339,6 +350,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -360,6 +372,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -381,6 +394,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -402,6 +416,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +448,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -486,6 +502,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -539,6 +556,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -592,6 +610,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -645,6 +664,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -698,6 +718,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -751,6 +772,7 @@ "name" : "SNOMEDCT" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -837,6 +859,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -912,6 +935,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -987,6 +1011,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1062,6 +1087,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1165,6 +1191,7 @@ "locator" : "45:3-46:71" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1444,6 +1471,7 @@ "locator" : "72:3-74:111" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1825,6 +1853,7 @@ "locator" : "77:3-79:105" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2206,6 +2235,7 @@ "locator" : "67:3-69:99" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2557,6 +2587,7 @@ "locator" : "89:3-90:85" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2788,6 +2819,7 @@ "locator" : "49:3-51:64" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3014,6 +3046,7 @@ "locator" : "54:3-57:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3356,6 +3389,7 @@ "locator" : "85:3-86:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3673,6 +3707,7 @@ "locator" : "101:3-110:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4676,6 +4711,7 @@ "locator" : "113:3-118:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5339,6 +5375,7 @@ "locator" : "93:3-98:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5949,6 +5986,7 @@ "locator" : "60:3-64:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6173,6 +6211,7 @@ "locator" : "82:3-82:40" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6245,8 +6284,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/SafeUseofOpioidsConcurrentPrescribing-3.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/SafeUseofOpioidsConcurrentPrescribing-3.3.000.json index 64e4c6b8f..adf563ab3 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/SafeUseofOpioidsConcurrentPrescribing-3.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/SafeUseofOpioidsConcurrentPrescribing-3.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -118,6 +120,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -143,6 +146,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -164,6 +168,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -185,6 +190,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -206,6 +212,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -227,6 +234,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -248,6 +256,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -269,6 +278,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -290,6 +300,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -321,6 +332,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -470,6 +482,7 @@ "locator" : "26:3-28:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -927,6 +940,7 @@ "locator" : "76:3-79:113" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1307,6 +1321,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1517,6 +1532,7 @@ "locator" : "33:3-44:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2498,6 +2514,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2573,6 +2590,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2648,6 +2666,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2723,6 +2742,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2998,6 +3018,7 @@ "locator" : "60:3-72:7" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4178,8 +4199,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-4.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-4.3.000.json index 3800112a3..582faf6da 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-4.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/StatinTherapyforthePreventionandTreatmentofCardiovascularDisease-4.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "51:32-51:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -216,6 +220,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -472,6 +488,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -493,6 +510,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -514,6 +532,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -535,6 +554,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -556,6 +576,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -577,6 +598,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -598,6 +620,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +642,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -640,6 +664,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -661,6 +686,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -682,6 +708,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -703,6 +730,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -724,6 +752,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -745,6 +774,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -766,6 +796,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -787,6 +818,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -808,6 +840,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -829,6 +862,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -850,6 +884,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -871,6 +906,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +928,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -913,6 +950,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -934,6 +972,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -955,6 +994,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -976,6 +1016,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -997,6 +1038,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1028,6 +1070,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1081,6 +1124,7 @@ "name" : "ICD10CM" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1195,6 +1239,7 @@ "locator" : "56:3-57:69" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1452,6 +1497,7 @@ "locator" : "60:3-61:81" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1923,6 +1969,7 @@ "locator" : "64:3-78:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2946,6 +2993,7 @@ "locator" : "81:3-84:33" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3356,6 +3404,7 @@ "locator" : "87:3-90:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3866,6 +3915,7 @@ "locator" : "193:3-201:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4586,6 +4636,7 @@ "locator" : "162:3-165:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5000,6 +5051,7 @@ "locator" : "93:3-94:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5144,6 +5196,7 @@ "locator" : "148:3-151:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5470,6 +5523,7 @@ "locator" : "97:3-101:82" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5732,6 +5786,7 @@ "locator" : "131:3-133:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6154,6 +6209,7 @@ "locator" : "154:3-159:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6948,6 +7004,7 @@ "locator" : "104:3-113:38" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7984,6 +8041,7 @@ "locator" : "180:3-190:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8782,6 +8840,7 @@ "locator" : "136:3-138:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9120,6 +9179,7 @@ "locator" : "141:3-145:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9566,6 +9626,7 @@ "locator" : "116:3-120:48" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9921,6 +9982,7 @@ "locator" : "168:3-173:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10489,6 +10551,7 @@ "locator" : "123:3-128:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10809,6 +10872,7 @@ "locator" : "216:3-219:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11183,6 +11247,7 @@ "locator" : "176:3-177:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11302,6 +11367,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11377,6 +11443,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11452,6 +11519,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11527,6 +11595,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11669,6 +11738,7 @@ "locator" : "222:3-226:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12059,8 +12129,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/TJC_Overall-4.4.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/TJC_Overall-4.4.000.json index 42076894a..7820b9c37 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/TJC_Overall-4.4.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/TJC_Overall-4.4.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "24:32-24:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -195,6 +198,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -220,6 +224,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -241,6 +246,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -262,6 +268,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -283,6 +290,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -304,6 +312,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -325,6 +334,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -346,6 +356,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -367,6 +378,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -388,6 +400,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -409,6 +422,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -430,6 +444,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -451,6 +466,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -482,6 +498,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -619,6 +636,7 @@ "locator" : "29:3-30:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -814,6 +832,7 @@ "locator" : "33:3-35:78" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1277,6 +1296,7 @@ "locator" : "60:3-66:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1881,6 +1901,7 @@ "locator" : "48:3-50:123" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2345,6 +2366,7 @@ "locator" : "53:3-57:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2870,6 +2892,7 @@ "locator" : "38:3-45:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3587,6 +3610,7 @@ "locator" : "69:3-71:169" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3998,6 +4022,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4218,6 +4243,7 @@ "name" : "StartValue" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4535,8 +4561,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UrinarySymptomScoreChange6to12MonthsAfterDiagnosisofBenignProstaticHyperplasia-2.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UrinarySymptomScoreChange6to12MonthsAfterDiagnosisofBenignProstaticHyperplasia-2.2.000.json index d74f1a147..89086d62b 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UrinarySymptomScoreChange6to12MonthsAfterDiagnosisofBenignProstaticHyperplasia-2.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UrinarySymptomScoreChange6to12MonthsAfterDiagnosisofBenignProstaticHyperplasia-2.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -80,6 +81,7 @@ "locator" : "25:32-25:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -146,6 +148,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -167,6 +170,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -188,6 +192,7 @@ }, { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -213,6 +218,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -234,6 +240,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -255,6 +262,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -276,6 +284,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -297,6 +306,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -318,6 +328,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -339,6 +350,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -360,6 +372,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +404,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -444,6 +458,7 @@ "name" : "ICD10CM" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -497,6 +512,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -550,6 +566,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -603,6 +620,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -656,6 +674,7 @@ "name" : "AdministrativeGender" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -742,6 +761,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -817,6 +837,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -892,6 +913,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -967,6 +989,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1050,6 +1073,7 @@ "locator" : "93:3-93:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1176,6 +1200,7 @@ "locator" : "60:3-61:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1496,6 +1521,7 @@ "locator" : "145:3-148:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1870,6 +1896,7 @@ "locator" : "96:3-96:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2011,6 +2038,7 @@ "locator" : "151:3-156:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2746,6 +2774,7 @@ "locator" : "128:3-142:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4091,6 +4120,7 @@ "locator" : "64:3-65:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4284,6 +4314,7 @@ "locator" : "106:3-110:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4788,6 +4819,7 @@ "locator" : "99:3-103:3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5262,6 +5294,7 @@ "locator" : "79:3-83:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5501,6 +5534,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5602,6 +5636,7 @@ "locator" : "48:3-52:20" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5985,6 +6020,7 @@ "locator" : "55:3-57:15" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6173,6 +6209,7 @@ "name" : "Urinary Symptom Score Improvement Greater Than or Equal To 3" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6304,6 +6341,7 @@ "locator" : "68:3-71:58" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6871,6 +6909,7 @@ "locator" : "74:3-76:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7342,6 +7381,7 @@ "locator" : "86:3-90:39" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7926,6 +7966,7 @@ "locator" : "122:3-125:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8355,6 +8396,7 @@ "locator" : "118:3-119:115" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8501,6 +8543,7 @@ "locator" : "113:3-115:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8716,8 +8759,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UseofHighRiskMedicationsintheElderly-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UseofHighRiskMedicationsintheElderly-9.3.000.json index 1db9d39cc..94807d5f8 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UseofHighRiskMedicationsintheElderly-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/UseofHighRiskMedicationsintheElderly-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "91:32-91:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -601,6 +622,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -622,6 +644,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -643,6 +666,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -664,6 +688,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -685,6 +710,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -706,6 +732,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -727,6 +754,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -748,6 +776,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -769,6 +798,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -790,6 +820,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -811,6 +842,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -832,6 +864,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -853,6 +886,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -874,6 +908,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -895,6 +930,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -916,6 +952,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -937,6 +974,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -958,6 +996,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -979,6 +1018,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1000,6 +1040,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1021,6 +1062,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1042,6 +1084,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1063,6 +1106,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1084,6 +1128,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1105,6 +1150,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1126,6 +1172,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1147,6 +1194,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1168,6 +1216,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1189,6 +1238,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1210,6 +1260,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1231,6 +1282,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1252,6 +1304,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1273,6 +1326,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1294,6 +1348,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1315,6 +1370,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1336,6 +1392,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1357,6 +1414,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1378,6 +1436,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1399,6 +1458,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1420,6 +1480,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1441,6 +1502,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1462,6 +1524,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1483,6 +1546,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1504,6 +1568,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1525,6 +1590,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1546,6 +1612,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1567,6 +1634,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1588,6 +1656,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1609,6 +1678,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1630,6 +1700,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1651,6 +1722,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1672,6 +1744,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1693,6 +1766,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1714,6 +1788,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1735,6 +1810,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1756,6 +1832,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1777,6 +1854,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1798,6 +1876,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1819,6 +1898,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1840,6 +1920,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1861,6 +1942,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1882,6 +1964,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1913,6 +1996,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2166,6 +2250,7 @@ "locator" : "115:3-124:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2944,6 +3029,7 @@ "locator" : "102:3-104:44" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3343,6 +3429,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3388,6 +3475,7 @@ "libraryName" : "Hospice" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3475,6 +3563,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4233,6 +4322,7 @@ "locator" : "108:3-108:101" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4387,6 +4477,7 @@ "locator" : "112:3-112:106" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4529,6 +4620,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4604,6 +4696,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4679,6 +4772,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4754,6 +4848,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4858,6 +4953,7 @@ "locator" : "224:3-225:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5089,6 +5185,7 @@ "name" : "Medication" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5539,6 +5636,7 @@ "locator" : "228:3-229:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5825,6 +5923,7 @@ "locator" : "139:3-144:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7676,6 +7775,7 @@ "locator" : "147:3-217:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13626,6 +13726,7 @@ "locator" : "220:3-221:62" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13765,8 +13866,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VTEICU-4.0.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VTEICU-4.0.000.json index a470289fd..492870d79 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VTEICU-4.0.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VTEICU-4.0.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -129,6 +131,7 @@ "locator" : "7:32-7:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -227,6 +230,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -704,6 +708,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -898,6 +903,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1039,6 +1045,7 @@ "name" : "Encounter" } ], "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1475,8 +1482,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VenousThromboembolismProphylaxis-9.3.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VenousThromboembolismProphylaxis-9.3.000.json index 0f8886a2b..62355bd88 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VenousThromboembolismProphylaxis-9.3.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/VenousThromboembolismProphylaxis-9.3.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -159,6 +162,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -208,6 +212,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -233,6 +238,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -254,6 +260,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -275,6 +282,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -296,6 +304,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -317,6 +326,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -338,6 +348,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -359,6 +370,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -380,6 +392,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -401,6 +414,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -422,6 +436,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -443,6 +458,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -464,6 +480,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -485,6 +502,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -506,6 +524,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -527,6 +546,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -548,6 +568,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -569,6 +590,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -590,6 +612,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +634,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -632,6 +656,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -653,6 +678,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -674,6 +700,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -695,6 +722,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -716,6 +744,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -737,6 +766,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -758,6 +788,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -779,6 +810,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -800,6 +832,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -821,6 +854,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -842,6 +876,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -863,6 +898,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -884,6 +920,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -905,6 +942,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -926,6 +964,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -947,6 +986,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -968,6 +1008,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -989,6 +1030,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1010,6 +1052,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1031,6 +1074,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1062,6 +1106,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1115,6 +1160,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1296,6 +1342,7 @@ "locator" : "57:3-64:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1969,6 +2016,7 @@ "locator" : "74:3-78:63" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2418,6 +2466,7 @@ "name" : "Encounter With Age Range and Without VTE Diagnosis or Obstetrical Conditions" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2462,6 +2511,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2542,6 +2592,7 @@ "locator" : "70:3-71:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2929,6 +2980,7 @@ "locator" : "81:3-86:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4031,6 +4083,7 @@ "locator" : "312:3-335:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5573,6 +5626,7 @@ "locator" : "338:3-340:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6003,6 +6057,7 @@ "locator" : "343:3-350:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -6698,6 +6753,7 @@ "locator" : "89:3-90:91" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7134,6 +7190,7 @@ "locator" : "353:3-362:87" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -7793,6 +7850,7 @@ "locator" : "152:3-155:133" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8425,6 +8483,7 @@ "locator" : "112:3-117:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -8852,6 +8911,7 @@ "locator" : "120:3-123:129" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -9406,6 +9466,7 @@ "locator" : "158:3-166:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -10339,6 +10400,7 @@ "locator" : "126:3-134:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11156,6 +11218,7 @@ "locator" : "93:3-98:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11435,6 +11498,7 @@ "locator" : "169:3-171:65" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -11729,6 +11793,7 @@ "locator" : "137:3-139:136" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12159,6 +12224,7 @@ "locator" : "142:3-149:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12854,6 +12920,7 @@ "locator" : "101:3-102:86" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -12990,6 +13057,7 @@ "locator" : "108:3-109:57" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13123,6 +13191,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13198,6 +13267,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13273,6 +13343,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13348,6 +13419,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -13556,6 +13628,7 @@ "locator" : "186:3-193:30" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -14418,6 +14491,7 @@ "locator" : "196:3-200:47" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15102,6 +15176,7 @@ "locator" : "230:3-239:70" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -15943,6 +16018,7 @@ "locator" : "276:3-288:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -17185,6 +17261,7 @@ "locator" : "291:3-303:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -18503,6 +18580,7 @@ "locator" : "214:3-227:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -19584,6 +19662,7 @@ "locator" : "203:3-211:68" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20000,6 +20079,7 @@ "locator" : "266:3-273:5" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -20749,6 +20829,7 @@ "locator" : "251:3-257:56" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21235,6 +21316,7 @@ "locator" : "260:3-263:94" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -21732,6 +21814,7 @@ "locator" : "306:3-308:187" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22185,6 +22268,7 @@ "locator" : "242:3-247:89" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -22393,8 +22477,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-9.2.000.json b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-9.2.000.json index a93e85945..09aa0e34e 100644 --- a/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-9.2.000.json +++ b/engine.jaxb/src/test/resources/org/opencds/cqf/cql/engine/execution/ElmTests/Regression/qdm2020/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescents-9.2.000.json @@ -20,6 +20,7 @@ }, { "type" : "UsingDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -69,6 +70,7 @@ "def" : [ { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -114,6 +116,7 @@ }, { "type" : "IncludeDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -174,6 +177,7 @@ "locator" : "29:32-29:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -240,6 +244,7 @@ "def" : [ { "type" : "CodeSystemDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -265,6 +270,7 @@ "def" : [ { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -286,6 +292,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -307,6 +314,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -328,6 +336,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -349,6 +358,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -370,6 +380,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -391,6 +402,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -412,6 +424,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -433,6 +446,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -454,6 +468,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -475,6 +490,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -496,6 +512,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -517,6 +534,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -538,6 +556,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -559,6 +578,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -580,6 +600,7 @@ }, { "type" : "ValueSetDef", "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -611,6 +632,7 @@ "name" : "LOINC" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -697,6 +719,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -772,6 +795,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -847,6 +871,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -922,6 +947,7 @@ "codeComparator" : "in" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1112,6 +1138,7 @@ "locator" : "98:3-104:67" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -1729,6 +1756,7 @@ "locator" : "89:3-91:43" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2145,6 +2173,7 @@ "name" : "Initial Population" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2245,6 +2274,7 @@ "locator" : "62:3-64:42" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2608,6 +2638,7 @@ "locator" : "72:3-74:35" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -2971,6 +3002,7 @@ "locator" : "67:3-69:35" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3313,6 +3345,7 @@ "locator" : "49:3-51:49" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3586,6 +3619,7 @@ "locator" : "54:3-55:66" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -3824,6 +3858,7 @@ "locator" : "58:3-59:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4019,6 +4054,7 @@ "locator" : "77:3-78:74" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4299,6 +4335,7 @@ "locator" : "81:3-82:73" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -4612,6 +4649,7 @@ "locator" : "85:3-86:119" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5027,6 +5065,7 @@ "locator" : "94:3-95:117" }, "annotation" : [ { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", @@ -5361,8 +5400,10 @@ } ] }, "annotation" : [ { - "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation" + "translatorOptions" : "EnableAnnotations,EnableLocators,DisableListDemotion,DisableListPromotion,DisableMethodInvocation", + "type" : "CqlToElmInfo" }, { + "type" : "Annotation", "s" : { "s" : [ { "name" : "{urn:hl7-org:cql-annotations:r1}s", diff --git a/engine/pom.xml b/engine/pom.xml index 74db9beaa..b01576f0a 100644 --- a/engine/pom.xml +++ b/engine/pom.xml @@ -9,10 +9,8 @@ 1.5.10-SNAPSHOT - org.opencds.cqf.cql engine 1.5.10-SNAPSHOT - jar engine @@ -24,21 +22,23 @@ org.slf4j slf4j-api - 1.7.32 org.apache.commons - commons-lang3 - 3.12.0 + commons-text org.jvnet.jaxb2_commons jaxb2-basics-runtime - 0.12.0 + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations @@ -47,36 +47,35 @@ ucum - - - com.fasterxml.jackson.core - jackson-databind - + - com.fasterxml.jackson.core - jackson-annotations + xpp3 + xpp3 + test - com.fasterxml.jackson.core - jackson-core + xpp3 + xpp3_xpath + test + - com.fasterxml.jackson.module - jackson-module-jaxb-annotations + info.cqframework + cql-to-elm + test - - - xpp3 - xpp3 + info.cqframework + model-jackson test - xpp3 - xpp3_xpath + info.cqframework + elm-jackson test + @@ -129,7 +128,7 @@ org.jvnet.jaxb2_commons jaxb2-basics - 0.12.0 + 0.13.1 org.jvnet.jaxb2_commons @@ -155,7 +154,7 @@ org.apache.maven.surefire surefire-testng - 2.21.0 + ${surefire.version} diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CollapseEvaluator.java b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CollapseEvaluator.java index 2974c1dbc..5e3873079 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CollapseEvaluator.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CollapseEvaluator.java @@ -104,8 +104,15 @@ public static List collapse(Iterable list, Quantity per, Con { Interval applyPer = getIntervalWithPerApplied(intervals.get(i), per, context); - if(isTemporal) { - applyPer = intervals.get(i); + if (isTemporal) { + if (per.getValue().compareTo(BigDecimal.ONE) == 0 || per.getValue().compareTo(BigDecimal.ZERO) == 0) { + // Temporal DataTypes already receive the precision adjustments at the OverlapsEvaluator and MeetsEvaluator. + // But they can only do full units (ms, seconds, days): They cannot do "4 days" of precision. + // The getIntervalWithPerApplied takes that into account. + applyPer = intervals.get(i); + } else { + precision = "millisecond"; + } } Boolean doMerge = AnyTrueEvaluator.anyTrue( diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CqlToElmBaseMixIn.java b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CqlToElmBaseMixIn.java new file mode 100644 index 000000000..aa432b979 --- /dev/null +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/CqlToElmBaseMixIn.java @@ -0,0 +1,18 @@ +package org.opencds.cqf.cql.engine.elm.execution; + +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import org.cqframework.cql.elm.execution.Annotation; +import org.cqframework.cql.elm.execution.CqlToElmError; +import org.cqframework.cql.elm.execution.CqlToElmInfo; + +@JsonTypeInfo( + use = JsonTypeInfo.Id.NAME, + include = JsonTypeInfo.As.PROPERTY, + property = "type") +@JsonSubTypes({ + @JsonSubTypes.Type(value = CqlToElmInfo.class, name = "a:CqlToElmInfo"), + @JsonSubTypes.Type(value = CqlToElmError.class, name = "a:CqlToElmError"), + @JsonSubTypes.Type(value = Annotation.class, name = "a:Annotation") +}) +public interface CqlToElmBaseMixIn {} \ No newline at end of file diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ExpressionMixin.java b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ExpressionMixin.java index b839f49a0..4e96ce112 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ExpressionMixin.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/ExpressionMixin.java @@ -65,6 +65,7 @@ @Type(value = ExistsEvaluator.class, name = "Exists"), @Type(value = ExpEvaluator.class, name = "Exp"), @Type(value = ExpandEvaluator.class, name = "Expand"), + @Type(value = ExpressionDefEvaluator.class, name = "ExpressionDef"), @Type(value = ExpressionRefEvaluator.class, name = "ExpressionRef"), @Type(value = FilterEvaluator.class, name = "Filter"), @Type(value = FirstEvaluator.class, name = "First"), diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/TypeSpecifierMixin.java b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/TypeSpecifierMixin.java index 94bc6e127..fa62c4905 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/TypeSpecifierMixin.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/elm/execution/TypeSpecifierMixin.java @@ -4,11 +4,7 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; -import org.cqframework.cql.elm.execution.ChoiceTypeSpecifier; -import org.cqframework.cql.elm.execution.ListTypeSpecifier; -import org.cqframework.cql.elm.execution.NamedTypeSpecifier; -import org.cqframework.cql.elm.execution.TupleTypeSpecifier; -import org.cqframework.cql.elm.execution.TypeSpecifier; +import org.cqframework.cql.elm.execution.*; @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "type") @JsonSubTypes({ @@ -16,7 +12,8 @@ @Type(value = NamedTypeSpecifier.class, name = "NamedTypeSpecifier"), @Type(value = ChoiceTypeSpecifier.class, name = "ChoiceTypeSpecifier"), @Type(value = ChoiceTypeSpecifier.class, name = "IntervalTypeSpecifier"), - @Type(value = ListTypeSpecifier.class, name = "ListTypeSpecifier") + @Type(value = ListTypeSpecifier.class, name = "ListTypeSpecifier"), + @Type(value = ParameterTypeSpecifier.class, name = "ParameterTypeSpecifier") }) public class TypeSpecifierMixin extends TypeSpecifier { } diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/exception/TerminologyProviderException.java b/engine/src/main/java/org/opencds/cqf/cql/engine/exception/TerminologyProviderException.java index 3c36489e5..6affa64a7 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/exception/TerminologyProviderException.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/exception/TerminologyProviderException.java @@ -5,6 +5,7 @@ * This class is meant to be thrown by implementations of the TerminologyProvider interface whenever they encounter an Exception */ public class TerminologyProviderException extends CqlException { + private static final long serialVersionUID = 1L; public TerminologyProviderException (String message) { diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/execution/CqlEngine.java b/engine/src/main/java/org/opencds/cqf/cql/engine/execution/CqlEngine.java index 69ce9e4af..4b73d32f0 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/execution/CqlEngine.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/execution/CqlEngine.java @@ -3,6 +3,7 @@ import static org.opencds.cqf.cql.engine.execution.NamespaceHelper.getNamePart; import static org.opencds.cqf.cql.engine.execution.NamespaceHelper.getUriPart; +import java.time.ZonedDateTime; import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashSet; @@ -144,6 +145,10 @@ public EvaluationResult evaluate(VersionedIdentifier libraryIdentifier, Map expressions, Pair contextParameter, Map parameters, DebugMap debugMap) { + return this.evaluate(libraryIdentifier, expressions, contextParameter, parameters, debugMap, null); + } + + public EvaluationResult evaluate(VersionedIdentifier libraryIdentifier, Set expressions, Pair contextParameter, Map parameters, DebugMap debugMap, ZonedDateTime evaluationDateTime) { // TODO: Figure out way to validate / invalidate library cache Map libraryCache = new HashMap<>(); @@ -158,7 +163,7 @@ public EvaluationResult evaluate(VersionedIdentifier libraryIdentifier, Set libraryCache, Library library, DebugMap debugMap) { + private Context initializeContext(Map libraryCache, Library library, DebugMap debugMap, ZonedDateTime evaluationDateTime) { // Context requires an initial library to init properly. // TODO: Allow context to be initialized with multiple libraries - Context context = new Context(library); + Context context = evaluationDateTime == null ? new Context(library) : new Context(library, evaluationDateTime); // TODO: Does the context actually need a library loaded if all the libraries are prefetched? // We'd have to make sure we include the dependencies too. diff --git a/engine/src/main/java/org/opencds/cqf/cql/engine/execution/JsonCqlLibraryReader.java b/engine/src/main/java/org/opencds/cqf/cql/engine/execution/JsonCqlLibraryReader.java index 7f326c56d..9a4240923 100644 --- a/engine/src/main/java/org/opencds/cqf/cql/engine/execution/JsonCqlLibraryReader.java +++ b/engine/src/main/java/org/opencds/cqf/cql/engine/execution/JsonCqlLibraryReader.java @@ -2,44 +2,57 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.Reader; +import java.net.URI; +import java.net.URL; -import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.MapperFeature; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; -import org.cqframework.cql.elm.execution.Element; -import org.cqframework.cql.elm.execution.Expression; -import org.cqframework.cql.elm.execution.Library; -import org.cqframework.cql.elm.execution.TypeSpecifier; -import org.opencds.cqf.cql.engine.elm.execution.LibraryWrapper; +import org.cqframework.cql.elm.execution.*; +import org.opencds.cqf.cql.engine.elm.execution.*; public class JsonCqlLibraryReader { + private static final JsonMapper mapper = JsonMapper.builder() + .defaultMergeable(true) + .enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL) + .addModule(new JaxbAnnotationModule()) + .addMixIn(Element.class, ElementMixin.class) + .addMixIn(Expression.class, ExpressionMixin.class) + .addMixIn(TypeSpecifier.class, TypeSpecifierMixin.class) + .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class) + .build(); + private JsonCqlLibraryReader() { } - public static ObjectMapper mapper() { - ObjectMapper mapper = new ObjectMapper(); - mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_DEFAULT); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - JaxbAnnotationModule module = new JaxbAnnotationModule(); - mapper.registerModule(module); - SimpleModule simpleModule = new SimpleModule(); - simpleModule.setMixInAnnotation(Element.class, org.opencds.cqf.cql.engine.elm.execution.ElementMixin.class); - simpleModule.setMixInAnnotation(Expression.class, org.opencds.cqf.cql.engine.elm.execution.ExpressionMixin.class); - simpleModule.setMixInAnnotation(TypeSpecifier.class, org.opencds.cqf.cql.engine.elm.execution.TypeSpecifierMixin.class); - //simpleModule.setMixInAnnotation(ExpressionDef.class, org.opencds.cqf.cql.elm.execution.ExpressionDefMixin.class); - mapper.registerModule(simpleModule); - return mapper; + public static Library read(File file) throws IOException { + return mapper.readValue(file, LibraryWrapper.class).getLibrary(); + } + + public static Library read(URL url) throws IOException { + return mapper.readValue(url, LibraryWrapper.class).getLibrary(); + } + + public static Library read(URI uri) throws IOException { + return mapper.readValue(uri.toURL(), LibraryWrapper.class).getLibrary(); + } + + public static Library read(String string) throws IOException { + return mapper.readValue(string, LibraryWrapper.class).getLibrary(); } - public static Library read(File reader) throws IOException { - return mapper().readValue(reader, LibraryWrapper.class).getLibrary(); + public static Library read(InputStream inputStream) throws IOException { + return mapper.readValue(inputStream, LibraryWrapper.class).getLibrary(); } public static Library read(Reader reader) throws IOException { - return mapper().readValue(reader, LibraryWrapper.class).getLibrary(); + return mapper.readValue(reader, LibraryWrapper.class).getLibrary(); } } diff --git a/engine/src/main/resources/cql-lm/schema/elm/clinicalexpression.xsd b/engine/src/main/resources/cql-lm/schema/elm/clinicalexpression.xsd index e9795198e..11a2d2268 100644 --- a/engine/src/main/resources/cql-lm/schema/elm/clinicalexpression.xsd +++ b/engine/src/main/resources/cql-lm/schema/elm/clinicalexpression.xsd @@ -1,698 +1,698 @@ - - - This file defines the expression extensions that introduce clinically relevant dependencies such as clinical data access, terminology, and value set considerations. - - - - - - The CodeFilterElement type specifies a terminology filter criteria for use within a retrieve, specified as either [property] [comparator] [value] or [search] [comparator] [value]. - - - - - - - An expression that provides the comparison value for the filter. The expression is expected to result in a List<Code> to match against. Only the clinical statements that match at least one of the specified codes will be returned. - - - - - - The property attribute specifies which property the filter applies to. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The valueSetProperty attribute optionally specifies which property of the model contains a value set identifier that can be used as an alternative mechanism for matching the value set of the retrieve, in the case when no code is specified in the source data. - - This attribute is intended to address the case where systems representing negation rationale for an activity not performed do so by indicating a valueset identifier rather than a code. For example, when indicating that a medication was not administered, the value set identifier for the expected medication is used, rather than indicating a specific medication that was not administered. In this case, the valueSetProperty attribute allows the retrieve to specify where to look for the value set identifier without needing to change the conceptual data model or the CQL logic describing the negated activity. - - Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The search attribute specifies the name of a search path for the filter. - - - - - The codeComparator attribute specifies how elements of the code property should be matched to the terminology. One of 'in', '=', or '~'. Note that 'in' will resolve to the appropriate terminology matching operator, resulting in equivalence semantics for value set and code system membership testing. - - - - - - - - The DateFilterElement type specifies a date-valued filter criteria for use within a retrieve, specified as either a date-valued [property], a date-value [lowProperty] and [highProperty] or a [search], and an expression that evaluates to a date or time type, an interval of a date or time type, or a time-valued Quantity. - - - - - - - An expression that provides the comparison value for the filter. The expression is expected to result in a date or time type, an interval of a date or time type, or a time-valued quantity. Only the clinical statements that match at least one of the specified codes will be returned. - - - - - - The dateProperty attribute optionally specifies which property of the model contains the clinically relevant date for the clinical statement. - - This property is expected to reference a property that is either a Date or DateTime, or an interval of Date or DateTime. In either case, the result set will only include instances where the value of the dateProperty is during the date range. For Date or DateTime values, this means the date is both the same or after the beginning of the range, and the same or before the end of the range. For Date- or DateTime-based interval values, this means that the entire interval is included in the date range. - - Instances with no value for the dateProperty will not be included in the result set if a date range is specified. - - Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the dateProperty must not be present. If specified, the lowProperty and highProperty values will be used to construct an interval with inclusive boundaries for the date range. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The lowProperty attribute optionally specifies which property of the model contains the low component of the clinically relevant date for the clinical statement. - - Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the property must not be present. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The highProperty attribute optionally specifies which property of the model contains the high component of the clinically relevant date for the clinical statement. - - Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the property must not be present. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The search attribute specifies the name of the search path to use for searching for values in the date range specified by the dateRange element. - - - - - - - - The OtherFilterElement type specifies an arbitrarily-typed filter criteria for use within a retrieve, specified as either [property] [comparator] [value] or [search] [comparator] [value]. - - - - - - - An expression that provides the comparison value for the filter. - - - - - - The property attribute specifies which property the filter applies to. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The search attribute specifies the name of a search path for the filter. - - - - - The comparator attribute specifies the comparison operation for the filter. - - - - - - - - The IncludeElement type specifies include information for an include within a retrieve. - - - - - - The localId of another Retrieve that specifies the data to be included in this retrieve. The target Retrieve will have an includedIn attribute referencing this includeElement. - - - - - The relatedDataType attribute specifies the type of the related data being requested. - - - - - The relatedProperty attribute specifies which property of the relatedDataType contains the relatedId for the clinical statement. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The relatedSearch attribute specifies the name of the search path to use for searching for data of the relatedDataType. - - - - - The isReverse attribute indicates that the include is reverse, i.e. that the relatedDataType is referencing the data being retrieved, rather than the retrieved data referencing the relatedDataType. - - - - - - - - The retrieve expression defines clinical data that will be used by the artifact. This expression allows clinically relevant filtering criteria to be provided in a well-defined and computable way. This operation defines the integration boundary for artifacts. The result of a retrieve is defined to return the same data for subsequent invocations within the same evaluation request. This means in particular that patient data updates made during the evaluation request are not visible to the artifact. In effect, the patient data is a snapshot of the data as of the start of the evaluation. This ensures strict deterministic and functional behavior of the artifact, and allows the implementation engine freedom to cache intermediate results in order to improve performance. - - - - - - - The id element optionally specifies an expression that results in a value that can be used to filter the retrieve to a specific id. - - - - - The codes element optionally specifies an expression that results in a List<Code> to match against. Only the clinical statements that match at least one of the specified codes will be returned. - - - - - The dateRange element optionally specifies an expression that results in an Interval<DateTime> to match against. Only those clinical statements whose date falls within the specified date range will be returned. - - - - - If specified, the context element references an expression that, when evaluated, provides the context for the retrieve. The expression evaluates to the instance id that will be used as the context for the retrieve. - - - - - Specifies a related data type to be included in the result as part of the retrieve. - - - - - Specifies a terminology filter to be applied as part of the retrieve. Each codeFilter is specified as [property] [comparator] [value] or [search] [comparator] [value]. When multiple codeFilters are present, they are all applied (i.e. ANDed). For simplicity, if this element is specified at all, it will include the code filter established by the attributes of the retrieve, as well as any additional filtering criteria as determined by optimization strategies. - - - - - Specifies a date filter to be applied as part of the retrieve. Each dateFilter is specifies as a [property], or a [lowProperty]-[highProperty], or a [search], and a [value] that is an expression that evaluates to an interval of a date or time value. When multiple dateFilters are present, they are all applied (i.e. ANDed). For simplicity, if this element is specified at all, it will include the date filter established by the attributes of the retrieve, as well as any additional filtering criteria as determined by optimization strategies. - - - - - Specifies other, non-id, -context, -terminology, or -date valued filter criteria to be applied as part of the retrieve. Each other Filter is specified as [property] [comparator] [value] or [search] [comparator] [value]. When multiple otherFilters are present, they are all applied (i.e. ANDed). This element is included to allow for additional filtering criteria as determined by optimization strategies. - - - - - - The dataType attribute specifies the type of data being requested. - - - - - The templateId attribute specifies an optional template to be used. If specified, the retrieve is defined to return only objects that conform to the template. - - - - - The idProperty attribute specifies which property of the model contains the Id for the clinical statement. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The idSearch attribute specifies the name of the search path to use for searching for the values in the id element. - - - - - The contextProperty attribute optionally specifies which property of the model contains the context value. - - Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. Note also that even in the case of an implementation catalog, implementations would still ned to respect contextProperty values in the ELM due to the possibility of the retrieve specifying alternate context paths. From the persepctive of ELM, the specification ensures that ELM can be processed without reference to the model information. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The contextSearch attribute specifies the name of the search path to use for searching for the context values. - - - - - The codeProperty attribute optionally specifies which property of the model contains the Code or Codes for the clinical statement. - - Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. Note also that even in the case of an implementation catalog, implementations would still need to respect codeProperty values in the ELM due to the possibility of the retrieve specifying alternate code filters. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The codeSearch attribute specifies the name of the search path to use for searching for the values in the code element. - - - - - The codeComparator attribute specifies how elements of the code property should be matched to the terminology. One of 'in', '=', or '~'. Note that 'in' will resolve to the appropriate terminology matching operator, resulting in equivalence semantics for value set and code system membership testing. - - - - - The valueSetProperty attribute optionally specifies which property of the model contains a value set identifier that can be used as an alternative mechanism for matching the value set of the retrieve, in the case when no code is specified in the source data. - - This attribute is intended to address the case where systems representing negation rationale for an activity not performed do so by indicating a valueset identifier rather than a code. For example, when indicating that a medication was not administered, the value set identifier for the expected medication is used, rather than indicating a specific medication that was not administered. In this case, the valueSetProperty attribute allows the retrieve to specify where to look for the value set identifier without needing to change the conceptual data model or the CQL logic describing the negated activity. - - Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The dateProperty attribute optionally specifies which property of the model contains the clinically relevant date for the clinical statement. - - This property is expected to reference a property that is either a Date or DateTime, or an interval of Date or DateTime. In either case, the result set will only include instances where the value of the dateProperty is during the date range. For Date or DateTime values, this means the date is both the same or after the beginning of the range, and the same or before the end of the range. For Date- or DateTime-based interval values, this means that the entire interval is included in the date range. - - Instances with no value for the dateProperty will not be included in the result set if a date range is specified. - - Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. If specified, the dateLowProperty and dateHighProperty values will be used to construct an interval with inclusive boundaries for the date range. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The dateLowProperty attribute optionally specifies which property of the model contains the low component of the clinically relevant date for the clinical statement. - - Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The dateHighProperty attribute optionally specifies which property of the model contains the high component of the clinically relevant date for the clinical statement. - - Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. - - This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. - - - - - The dateSearch attribute specifies the name of the search path to use for searching for values in the date range specified by the dateRange element. - - - - - The localId of another Retrieve that includes the data for this retrieve. The target Retrieve will have an includeElement referencing this retrieve. - - - - - - - - The Search operation provides an operator that returns the result of an indexing expression on an instance. It is effectively the same as a property access, but uses the name of a defined search on the type, rather than the name of a property on the class. - - - - - - - - - The CodeSystemDef type defines a code system identifier that can then be used to identify code systems involved in value set definitions. - - - - - - The name of the code system used for reference. - - - - - The unique identifier of the code system. - - - - - The version of the code system to be used. If no version is specified, the most current published version of the code system is assumed. - - - - - - - - - The ValueSetDef type defines a value set identifier that can be referenced by name anywhere within an expression. - - The id specifies the globally unique identifier for the value set. This may be an HL7 OID, a FHIR URL, or a CTS2 value set URL. - - If version is specified, it will be used to resolve the version of the value set definition to be used. Otherwise, the most current published version of the value set is assumed. - - If codeSystems are specified, they will be used to resolve the code systems used within the value set definition to construct the expansion set. - Note that the recommended approach to statically binding to an expansion set is to use a value set definition that specifies the version of each code system used. The codeSystemVersions attribute is provided only to ensure static binding can be achieved when the value set definition does not specify code system versions as part of the definition header. - - - - - - - The code system that should be used to construct the expansion set. Note that the recommended approach to statically binding to an expansion set is to use a value set definition that specifies the version of each code system used. The codeSystem elements are provided only to ensure static binding can be achieved when the value set definition does not specify code system versions as part of the definition header. - - - - - - - The unique identifier of the value set to be retrieved. - - - - - The version of the value set to be retrieved. If no version is provided, the most current published version of the value set is assumed. - - - - - - - - - The CodeDef type defines a code identifier that can then be used to reference single codes anywhere within an expression. - - - - - - - The code system that contains the code being referenced. - - - - - - The name of the code used for reference. - - - - - The unique identifier of the code. - - - - - An optional display string used to describe the code. - - - - - - - - - The ConceptDef type defines a concept identifier that can then be used to reference single concepts anywhere within an expression. - - - - - - - A code that makes up the concept. All codes within a given concept must be synonyms. - - - - - - The name of the concept used for reference. - - - - - An optional display string used to describe the concept. - - - - - - - - - The CodeSystemRef expression allows a previously defined named code system to be referenced within an expression. Conceptually, referencing a code system returns the set of codes in the code system. Note that this operation should almost never be performed in practice. Code system references are allowed in order to allow for testing of code membership in a particular code system. - - - - - - - - - - - The ValueSetRef expression allows a previously defined named value set to be referenced within an expression. Conceptually, referencing a value set returns the expansion set for the value set as a list of codes. - - - - - - - - - - - - The CodeRef expression allows a previously defined code to be referenced within an expression. - - - - - - - - - - - The ConceptRef expression allows a previously defined concept to be referenced within an expression. - - - - - - - - - - - The Code type represents a literal code selector. - - - - - - - - - - - - - - The Concept type represents a literal concept selector. - - - - - - - - - - - - - The InCodeSystem operator returns true if the given code is in the given code system. - - The first argument is expected to be a String, Code, or Concept. - - The second argument is expected to be of type CodeSystem. When this argument is statically a CodeSystemRef, this allows for both static analysis of the code system references within an artifact, as well as the implementation of code system membership by the target environment as a service call to a terminology server, if desired. - - - - - - - - - - - - - - The AnyInCodeSystem operator returns true if any of the given codes are in the given code system. - - The first argument is expected to be a list of String, Code, or Concept. - - The second argument is expected to be of type CodeSystem. When this argument is statically a CodeSystemRef, this allows for both static analysis of the code system references within an artifact, as well as the implementation of code system membership by the target environment as a service call to a terminology server, if desired. - - - - - - - - - - - - - - The InValueSet operator returns true if the given code is in the given value set. - - The first argument is expected to be a String, Code, or Concept. - - The second argument is expected to be of type ValueSet. When this argument is statically a ValueSetRef, this allows for both static analysis of the value set references within an artifact, as well as the implementation of valueset membership by the target environment as a service call to a terminology server, if desired. - - - - - - - - - - - - - - The AnyInValueSet operator returns true if any of the given codes are in the given value set. - - The first argument is expected to be a list of String, Code, or Concept. - - The second argument is expected to be of type ValueSet. When this argument is statically a ValueSetRef, this allows for both static analysis of the value set references within an artifact, as well as the implementation of valueset membership by the target environment as a service call to a terminology server, if desired. - - - - - - - - - - - - - - The ExpandValueSet operator returns the current expansion for the given value set. - - The operation exoects a single argument of type ValueSet. This may be a static reference to a value set (i.e. a ValueSetRef), or a ValueSet value to support dynamic value set usage. The operation is used as the implicit conversion from a ValueSet reference to a list of codes. - - If the argument is null, the result is null. - - - - - - - - The Subsumes operator returns true if the given codes are equivalent, or if the first code subsumes the second (i.e. the first code is an ancestor of the second in a subsumption hierarchy), and false otherwise. - - For the Concept overload, this operator returns true if any code in the first concept subsumes any code in the second. - - If either or both arguments are null, the result is null. - - - - - - - - The SubsumedBy operator returns true if the given codes are equivalent, or if the first code is subsumed by the second code (i.e. the first code is a descendent of the second code in a subsumption hierarchy), and false otherwise. - - For the Concept overload, this operator returns true if any code in the first concept is subsumed by any code in the second. - - If either or both arguments are null, the result is null. - - - - - - - - The Quantity type defines a clinical quantity. For example, the quantity 10 days or 30 mmHg. The value is a decimal, while the unit is expected to be a valid UCUM unit or calendar duration keyword, singular or plural. - - - - - - - - - - - The Ratio type defines a ratio between two quantities. For example, the titre 1:128, or the concentration ratio 5 mg/10 mL. The numerator and denominator are both quantities. - - - - - - - - - - - - - Calculates the age in the specified precision of a person born on the given date. - - The CalculateAge operator is defined for Date and DateTime. - - For the Date overload, the calculation is performed using Today(), the precision must be one of year, month, week, or day, and the result is the number of whole calendar periods that have elapsed between the given date and today. - - For the DateTime overload, the calculation is performed using Now(), and the result is the number of whole calendar periods that have elapsed between the given datetime and now. - - - - - - - - - - Calculates the age in the specified precision of a person born on a given date, as of another given date. - - The CalculateAgeAt operator has two signatures: - (Date, Date) - (DateTime, DateTime) - - For the Date overload, precision must be one of year, month, week, or day, and the result is the number of whole calendar periods that have elapsed between the first date and the second date. - - For the DateTime overload, the result is the number of whole calendar periods that have elapsed between the first datetime and the second datetime. - - - - - - - + + + This file defines the expression extensions that introduce clinically relevant dependencies such as clinical data access, terminology, and value set considerations. + + + + + + The CodeFilterElement type specifies a terminology filter criteria for use within a retrieve, specified as either [property] [comparator] [value] or [search] [comparator] [value]. + + + + + + + An expression that provides the comparison value for the filter. The expression is expected to result in a List<Code> to match against. Only the clinical statements that match at least one of the specified codes will be returned. + + + + + + The property attribute specifies which property the filter applies to. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The valueSetProperty attribute optionally specifies which property of the model contains a value set identifier that can be used as an alternative mechanism for matching the value set of the retrieve, in the case when no code is specified in the source data. + +This attribute is intended to address the case where systems representing negation rationale for an activity not performed do so by indicating a valueset identifier rather than a code. For example, when indicating that a medication was not administered, the value set identifier for the expected medication is used, rather than indicating a specific medication that was not administered. In this case, the valueSetProperty attribute allows the retrieve to specify where to look for the value set identifier without needing to change the conceptual data model or the CQL logic describing the negated activity. + +Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The search attribute specifies the name of a search path for the filter. + + + + + The codeComparator attribute specifies how elements of the code property should be matched to the terminology. One of 'in', '=', or '~'. Note that 'in' will resolve to the appropriate terminology matching operator, resulting in equivalence semantics for value set and code system membership testing. + + + + + + + + The DateFilterElement type specifies a date-valued filter criteria for use within a retrieve, specified as either a date-valued [property], a date-value [lowProperty] and [highProperty] or a [search], and an expression that evaluates to a date or time type, an interval of a date or time type, or a time-valued Quantity. + + + + + + + An expression that provides the comparison value for the filter. The expression is expected to result in a date or time type, an interval of a date or time type, or a time-valued quantity. Only the clinical statements that match at least one of the specified codes will be returned. + + + + + + The dateProperty attribute optionally specifies which property of the model contains the clinically relevant date for the clinical statement. + +This property is expected to reference a property that is either a Date or DateTime, or an interval of Date or DateTime. In either case, the result set will only include instances where the value of the dateProperty is during the date range. For Date or DateTime values, this means the date is both the same or after the beginning of the range, and the same or before the end of the range. For Date- or DateTime-based interval values, this means that the entire interval is included in the date range. + +Instances with no value for the dateProperty will not be included in the result set if a date range is specified. + +Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the dateProperty must not be present. If specified, the lowProperty and highProperty values will be used to construct an interval with inclusive boundaries for the date range. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The lowProperty attribute optionally specifies which property of the model contains the low component of the clinically relevant date for the clinical statement. + +Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the property must not be present. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The highProperty attribute optionally specifies which property of the model contains the high component of the clinically relevant date for the clinical statement. + +Note that if the property is specified, the lowProperty and highProperty attributes must not be present. And conversely, if the lowProperty and highProperty attributes are specified, the property must not be present. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The search attribute specifies the name of the search path to use for searching for values in the date range specified by the dateRange element. + + + + + + + + The OtherFilterElement type specifies an arbitrarily-typed filter criteria for use within a retrieve, specified as either [property] [comparator] [value] or [search] [comparator] [value]. + + + + + + + An expression that provides the comparison value for the filter. + + + + + + The property attribute specifies which property the filter applies to. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The search attribute specifies the name of a search path for the filter. + + + + + The comparator attribute specifies the comparison operation for the filter. + + + + + + + + The IncludeElement type specifies include information for an include within a retrieve. + + + + + + The localId of another Retrieve that specifies the data to be included in this retrieve. The target Retrieve will have an includedIn attribute referencing this includeElement. + + + + + The relatedDataType attribute specifies the type of the related data being requested. + + + + + The relatedProperty attribute specifies which property of the relatedDataType contains the relatedId for the clinical statement. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The relatedSearch attribute specifies the name of the search path to use for searching for data of the relatedDataType. + + + + + The isReverse attribute indicates that the include is reverse, i.e. that the relatedDataType is referencing the data being retrieved, rather than the retrieved data referencing the relatedDataType. + + + + + + + + The retrieve expression defines clinical data that will be used by the artifact. This expression allows clinically relevant filtering criteria to be provided in a well-defined and computable way. This operation defines the integration boundary for artifacts. The result of a retrieve is defined to return the same data for subsequent invocations within the same evaluation request. This means in particular that patient data updates made during the evaluation request are not visible to the artifact. In effect, the patient data is a snapshot of the data as of the start of the evaluation. This ensures strict deterministic and functional behavior of the artifact, and allows the implementation engine freedom to cache intermediate results in order to improve performance. + + + + + + + The id element optionally specifies an expression that results in a value that can be used to filter the retrieve to a specific id. + + + + + The codes element optionally specifies an expression that results in a List<Code> to match against. Only the clinical statements that match at least one of the specified codes will be returned. + + + + + The dateRange element optionally specifies an expression that results in an Interval<DateTime> to match against. Only those clinical statements whose date falls within the specified date range will be returned. + + + + + If specified, the context element references an expression that, when evaluated, provides the context for the retrieve. The expression evaluates to the instance id that will be used as the context for the retrieve. + + + + + Specifies a related data type to be included in the result as part of the retrieve. + + + + + Specifies a terminology filter to be applied as part of the retrieve. Each codeFilter is specified as [property] [comparator] [value] or [search] [comparator] [value]. When multiple codeFilters are present, they are all applied (i.e. ANDed). For simplicity, if this element is specified at all, it will include the code filter established by the attributes of the retrieve, as well as any additional filtering criteria as determined by optimization strategies. + + + + + Specifies a date filter to be applied as part of the retrieve. Each dateFilter is specifies as a [property], or a [lowProperty]-[highProperty], or a [search], and a [value] that is an expression that evaluates to an interval of a date or time value. When multiple dateFilters are present, they are all applied (i.e. ANDed). For simplicity, if this element is specified at all, it will include the date filter established by the attributes of the retrieve, as well as any additional filtering criteria as determined by optimization strategies. + + + + + Specifies other, non-id, -context, -terminology, or -date valued filter criteria to be applied as part of the retrieve. Each other Filter is specified as [property] [comparator] [value] or [search] [comparator] [value]. When multiple otherFilters are present, they are all applied (i.e. ANDed). This element is included to allow for additional filtering criteria as determined by optimization strategies. + + + + + + The dataType attribute specifies the type of data being requested. + + + + + The templateId attribute specifies an optional template to be used. If specified, the retrieve is defined to return only objects that conform to the template. + + + + + The idProperty attribute specifies which property of the model contains the Id for the clinical statement. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The idSearch attribute specifies the name of the search path to use for searching for the values in the id element. + + + + + The contextProperty attribute optionally specifies which property of the model contains the context value. + +Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. Note also that even in the case of an implementation catalog, implementations would still ned to respect contextProperty values in the ELM due to the possibility of the retrieve specifying alternate context paths. From the persepctive of ELM, the specification ensures that ELM can be processed without reference to the model information. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The contextSearch attribute specifies the name of the search path to use for searching for the context values. + + + + + The codeProperty attribute optionally specifies which property of the model contains the Code or Codes for the clinical statement. + +Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. Note also that even in the case of an implementation catalog, implementations would still need to respect codeProperty values in the ELM due to the possibility of the retrieve specifying alternate code filters. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The codeSearch attribute specifies the name of the search path to use for searching for the values in the code element. + + + + + The codeComparator attribute specifies how elements of the code property should be matched to the terminology. One of 'in', '=', or '~'. Note that 'in' will resolve to the appropriate terminology matching operator, resulting in equivalence semantics for value set and code system membership testing. + + + + + The valueSetProperty attribute optionally specifies which property of the model contains a value set identifier that can be used as an alternative mechanism for matching the value set of the retrieve, in the case when no code is specified in the source data. + +This attribute is intended to address the case where systems representing negation rationale for an activity not performed do so by indicating a valueset identifier rather than a code. For example, when indicating that a medication was not administered, the value set identifier for the expected medication is used, rather than indicating a specific medication that was not administered. In this case, the valueSetProperty attribute allows the retrieve to specify where to look for the value set identifier without needing to change the conceptual data model or the CQL logic describing the negated activity. + +Note that implementers could also specify this information elsewhere as part of an implementation catalog, rather than on each Retrieve expression, but allowing it to be specified in the retrieve expression gives the most flexibility. From the perspective of ELM, the specification ensures that ELM can be processed without reference to the model information. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The dateProperty attribute optionally specifies which property of the model contains the clinically relevant date for the clinical statement. + +This property is expected to reference a property that is either a Date or DateTime, or an interval of Date or DateTime. In either case, the result set will only include instances where the value of the dateProperty is during the date range. For Date or DateTime values, this means the date is both the same or after the beginning of the range, and the same or before the end of the range. For Date- or DateTime-based interval values, this means that the entire interval is included in the date range. + +Instances with no value for the dateProperty will not be included in the result set if a date range is specified. + +Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. If specified, the dateLowProperty and dateHighProperty values will be used to construct an interval with inclusive boundaries for the date range. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The dateLowProperty attribute optionally specifies which property of the model contains the low component of the clinically relevant date for the clinical statement. + +Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The dateHighProperty attribute optionally specifies which property of the model contains the high component of the clinically relevant date for the clinical statement. + +Note that if the dateProperty is specified, the dateLowProperty and dateHighProperty attributes must not be present. And conversely, if the dateLowProperty and dateHighProperty attributes are specified, the dateProperty must not be present. + +This property may be specified as a path, including qualifiers and constant indexers. The <simplePath> production rule in the CQL grammar provides the formal semantics for this path. + + + + + The dateSearch attribute specifies the name of the search path to use for searching for values in the date range specified by the dateRange element. + + + + + The localId of another Retrieve that includes the data for this retrieve. The target Retrieve will have an includeElement referencing this retrieve. + + + + + + + + The Search operation provides an operator that returns the result of an indexing expression on an instance. It is effectively the same as a property access, but uses the name of a defined search on the type, rather than the name of a property on the class. + + + + + + + + + The CodeSystemDef type defines a code system identifier that can then be used to identify code systems involved in value set definitions. + + + + + + The name of the code system used for reference. + + + + + The unique identifier of the code system. + + + + + The version of the code system to be used. If no version is specified, the most current published version of the code system is assumed. + + + + + + + + + The ValueSetDef type defines a value set identifier that can be referenced by name anywhere within an expression. + +The id specifies the globally unique identifier for the value set. This may be an HL7 OID, a FHIR URL, or a CTS2 value set URL. + +If version is specified, it will be used to resolve the version of the value set definition to be used. Otherwise, the most current published version of the value set is assumed. + +If codeSystems are specified, they will be used to resolve the code systems used within the value set definition to construct the expansion set. +Note that the recommended approach to statically binding to an expansion set is to use a value set definition that specifies the version of each code system used. The codeSystemVersions attribute is provided only to ensure static binding can be achieved when the value set definition does not specify code system versions as part of the definition header. + + + + + + + The code system that should be used to construct the expansion set. Note that the recommended approach to statically binding to an expansion set is to use a value set definition that specifies the version of each code system used. The codeSystem elements are provided only to ensure static binding can be achieved when the value set definition does not specify code system versions as part of the definition header. + + + + + + + The unique identifier of the value set to be retrieved. + + + + + The version of the value set to be retrieved. If no version is provided, the most current published version of the value set is assumed. + + + + + + + + + The CodeDef type defines a code identifier that can then be used to reference single codes anywhere within an expression. + + + + + + + The code system that contains the code being referenced. + + + + + + The name of the code used for reference. + + + + + The unique identifier of the code. + + + + + An optional display string used to describe the code. + + + + + + + + + The ConceptDef type defines a concept identifier that can then be used to reference single concepts anywhere within an expression. + + + + + + + A code that makes up the concept. All codes within a given concept must be synonyms. + + + + + + The name of the concept used for reference. + + + + + An optional display string used to describe the concept. + + + + + + + + + The CodeSystemRef expression allows a previously defined named code system to be referenced within an expression. Conceptually, referencing a code system returns the set of codes in the code system. Note that this operation should almost never be performed in practice. Code system references are allowed in order to allow for testing of code membership in a particular code system. + + + + + + + + + + + The ValueSetRef expression allows a previously defined named value set to be referenced within an expression. Conceptually, referencing a value set returns the expansion set for the value set as a list of codes. + + + + + + + + + + + + The CodeRef expression allows a previously defined code to be referenced within an expression. + + + + + + + + + + + The ConceptRef expression allows a previously defined concept to be referenced within an expression. + + + + + + + + + + + The Code type represents a literal code selector. + + + + + + + + + + + + + + The Concept type represents a literal concept selector. + + + + + + + + + + + + + The InCodeSystem operator returns true if the given code is in the given code system. + +The first argument is expected to be a String, Code, or Concept. + +The second argument is expected to be of type CodeSystem. When this argument is statically a CodeSystemRef, this allows for both static analysis of the code system references within an artifact, as well as the implementation of code system membership by the target environment as a service call to a terminology server, if desired. + + + + + + + + + + + + + + The AnyInCodeSystem operator returns true if any of the given codes are in the given code system. + +The first argument is expected to be a list of String, Code, or Concept. + +The second argument is expected to be of type CodeSystem. When this argument is statically a CodeSystemRef, this allows for both static analysis of the code system references within an artifact, as well as the implementation of code system membership by the target environment as a service call to a terminology server, if desired. + + + + + + + + + + + + + + The InValueSet operator returns true if the given code is in the given value set. + +The first argument is expected to be a String, Code, or Concept. + +The second argument is expected to be of type ValueSet. When this argument is statically a ValueSetRef, this allows for both static analysis of the value set references within an artifact, as well as the implementation of valueset membership by the target environment as a service call to a terminology server, if desired. + + + + + + + + + + + + + + The AnyInValueSet operator returns true if any of the given codes are in the given value set. + +The first argument is expected to be a list of String, Code, or Concept. + +The second argument is expected to be of type ValueSet. When this argument is statically a ValueSetRef, this allows for both static analysis of the value set references within an artifact, as well as the implementation of valueset membership by the target environment as a service call to a terminology server, if desired. + + + + + + + + + + + + + + The ExpandValueSet operator returns the current expansion for the given value set. + +The operation exoects a single argument of type ValueSet. This may be a static reference to a value set (i.e. a ValueSetRef), or a ValueSet value to support dynamic value set usage. The operation is used as the implicit conversion from a ValueSet reference to a list of codes. + +If the argument is null, the result is null. + + + + + + + + The Subsumes operator returns true if the given codes are equivalent, or if the first code subsumes the second (i.e. the first code is an ancestor of the second in a subsumption hierarchy), and false otherwise. + +For the Concept overload, this operator returns true if any code in the first concept subsumes any code in the second. + +If either or both arguments are null, the result is null. + + + + + + + + The SubsumedBy operator returns true if the given codes are equivalent, or if the first code is subsumed by the second code (i.e. the first code is a descendent of the second code in a subsumption hierarchy), and false otherwise. + +For the Concept overload, this operator returns true if any code in the first concept is subsumed by any code in the second. + +If either or both arguments are null, the result is null. + + + + + + + + The Quantity type defines a clinical quantity. For example, the quantity 10 days or 30 mmHg. The value is a decimal, while the unit is expected to be a valid UCUM unit or calendar duration keyword, singular or plural. + + + + + + + + + + + The Ratio type defines a ratio between two quantities. For example, the titre 1:128, or the concentration ratio 5 mg/10 mL. The numerator and denominator are both quantities. + + + + + + + + + + + + + Calculates the age in the specified precision of a person born on the given date. + +The CalculateAge operator is defined for Date and DateTime. + +For the Date overload, the calculation is performed using Today(), the precision must be one of year, month, week, or day, and the result is the number of whole calendar periods that have elapsed between the given date and today. + +For the DateTime overload, the calculation is performed using Now(), and the result is the number of whole calendar periods that have elapsed between the given datetime and now. + + + + + + + + + + Calculates the age in the specified precision of a person born on a given date, as of another given date. + +The CalculateAgeAt operator has two signatures: + (Date, Date) + (DateTime, DateTime) + +For the Date overload, precision must be one of year, month, week, or day, and the result is the number of whole calendar periods that have elapsed between the first date and the second date. + +For the DateTime overload, the result is the number of whole calendar periods that have elapsed between the first datetime and the second datetime. + + + + + + + diff --git a/engine/src/main/resources/cql-lm/schema/elm/cqlannotations.xsd b/engine/src/main/resources/cql-lm/schema/elm/cqlannotations.xsd index 5df8e1926..454e5f084 100644 --- a/engine/src/main/resources/cql-lm/schema/elm/cqlannotations.xsd +++ b/engine/src/main/resources/cql-lm/schema/elm/cqlannotations.xsd @@ -1,19 +1,37 @@ + + + The CqlToElmBase type defines the abstract base type for all annotation elements in the CQL Translator. + + - - - - + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + @@ -116,7 +134,11 @@ - - + + + + + + diff --git a/engine/src/main/resources/cql-lm/schema/elm/expression.xsd b/engine/src/main/resources/cql-lm/schema/elm/expression.xsd index af662c18c..e730908ed 100644 --- a/engine/src/main/resources/cql-lm/schema/elm/expression.xsd +++ b/engine/src/main/resources/cql-lm/schema/elm/expression.xsd @@ -1,14 +1,20 @@ - + This file defines the core expression components used throughout artifacts based on the Expression Logical Model. The core expression components defined here are intended to be general purpose, and do not reference anything specific to the clinical quality domain. This layering is intended to isolate the conceptual elements of a general purpose expression language from the clinically-focused operations relevant to the clinical quality domain. + The Element type defines the abstract base type for all library elements in ELM. - + The annotation element provides a mechanism for decorating expressions with application-specific information such as translation hints, visual designer information, or debug symbols. @@ -122,6 +128,16 @@ + + + A type which is generic class parameter such as T in MyGeneric<T extends SomeType>. + + + + + + + The Expression type defines the abstract base type for all expressions used in the ELM expression language. @@ -229,6 +245,7 @@ + @@ -602,11 +619,11 @@ If no valid conversion exists from the actual value to the target type, the resu This operator supports conversion: -Between String and each of Boolean, Integer, Decimal, Quantity, Ratio, Date, DateTime, and Time +Between String and each of Boolean, Integer, Long, Decimal, Quantity, Ratio, Date, DateTime, and Time as well as: -From Integer to Decimal or Quantity +From Integer to Long, Decimal or Quantity From Decimal to Quantity Between Date and DateTime From Code to Concept @@ -629,11 +646,11 @@ Conversion between String and Date/DateTime/Time is performed using the ISO-8601 This operator returns true for conversion: -Between String and each of Boolean, Integer, Decimal, Quantity, Ratio, Date, DateTime, and Time, +Between String and each of Boolean, Integer, Long, Decimal, Quantity, Ratio, Date, DateTime, and Time, as well as: -From Integer to Decimal or Quantity +From Integer to Long, Decimal, or Quantity From Decimal to Quantity Between Date and DateTime From Code to Concept @@ -656,6 +673,10 @@ Conversion between String and Date/DateTime/Time is checked using the ISO-8601 s The operator accepts 'true', 't', 'yes', 'y', and '1' as string representations of true, and 'false', 'f', 'no', 'n', and '0' as string representations of false, ignoring case. +If the input is an Integer or Long, the result is true if the integer is 1, false if the integer is 0. + +If the input is a Decimal, the result is true if the decimal is 1.0, false if the decimal is 0.0. + If the input cannot be interpreted as a valid Boolean value, the result is null. If the argument is null the result is null. @@ -666,10 +687,14 @@ If the argument is null the result is null. - The ConvertsToBoolean operator returns true if the value of its argument can be converted to a Boolean value. + The ConvertsToBoolean operator returns true if the value of its argument is or can be converted to a Boolean value. The operator accepts 'true', 't', 'yes', 'y', and '1' as string representations of true, and 'false', 'f', 'no', 'n', and '0' as string representations of false, ignoring case. +If the input is an Integer or Long, the result is true if the integer is 1 or 0. + +If the input is a Decimal, the result is true if the decimal is 1.0 or 0.0. + If the input cannot be interpreted as a valid Boolean value, the result is false. If the argument is null the result is null. @@ -682,6 +707,8 @@ If the argument is null the result is null. The ToConcept operator converts a value of type Code to a Concept value with the given Code as its primary and only Code. If the Code has a display value, the resulting Concept will have the same display value. +If the input is a list of Codes, the resulting Concept will have all the input Codes, and will not have a display value. + If the argument is null, the result is null. @@ -690,7 +717,7 @@ If the argument is null, the result is null. - The ConvertsToDate operator returns true if the value of its argument can be converted to a Date value. + The ConvertsToDate operator returns true if the value of its argument is or can be converted to a Date value. For String values, The operator expects the string to be formatted using the ISO-8601 date representation: @@ -718,6 +745,8 @@ For String values, The operator expects the string to be formatted using the ISO YYYY-MM-DD +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + In addition, the string must be interpretable as a valid date value. Note that the operator can take datetime formatted strings and will ignore the time portions. @@ -736,11 +765,13 @@ If the argument is null, the result is null. - The ConvertsToDateTime operator returns true if the value of its argument can be converted to a DateTime value. + The ConvertsToDateTime operator returns true if the value of its argument is or can be converted to a DateTime value. For String values, the operator expects the string to be formatted using the ISO-8601 datetime representation: -YYYY-MM-DDThh:mm:ss.fff(+|-)hh:mm +YYYY-MM-DDThh:mm:ss.fff(Z|((+|-)hh:mm)) + +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. In addition, the string must be interpretable as a valid DateTime value. @@ -760,7 +791,9 @@ If the argument is null, the result is null. For String values, the operator expects the string to be formatted using the ISO-8601 datetime representation: -YYYY-MM-DDThh:mm:ss.fff(+|-)hh:mm +YYYY-MM-DDThh:mm:ss.fff(Z|((+|-)hh:mm)) + +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. In addition, the string must be interpretable as a valid DateTime value. @@ -778,16 +811,20 @@ If the argument is null, the result is null. - The ConvertsToDecimal operator returns true if the value of its argument can be converted to a Decimal value. The operator accepts strings using the following format: + The ConvertsToDecimal operator returns true if the value of its argument is or can be converted to a Decimal value. The operator accepts strings using the following format: (+|-)?#0(.0#)? Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit, followed optionally by a decimal point, at least one digit, and any number of additional digits (including none). -Note that the decimal value returned by this operator must be limited in precision and scale to the maximum precision and scale representable for Decimal values within CQL. +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + +Note that for this operator to return true, the input value must be limited in precision and scale to the maximum precision and scale representable for Decimal values within CQL. If the input string is not formatted correctly, or cannot be interpreted as a valid Decimal value, the result is false. +If the input is a Boolean, the result is true. + If the argument is null, the result is null. @@ -802,10 +839,14 @@ If the argument is null, the result is null. Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit, followed optionally by a decimal point, at least one digit, and any number of additional digits (including none). +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + Note that the decimal value returned by this operator must be limited in precision and scale to the maximum precision and scale representable for Decimal values within CQL. If the input string is not formatted correctly, or cannot be interpreted as a valid Decimal value, the result is null. +If the input is Boolean, true will result in 1.0, false will result in 0.0. + If the argument is null, the result is null. @@ -814,16 +855,20 @@ If the argument is null, the result is null. - The ConvertsToInteger operator returns true if the value of its argument can be converted to an Integer value. The operator accepts strings using the following format: + The ConvertsToInteger operator returns true if the value of its argument is or can be converted to an Integer value. The operator accepts strings using the following format: (+|-)?#0 Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. -Note that the integer value returned by this operator must be a valid value in the range representable for Integer values in CQL. +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + +Note that for this operator to return true, the input must be a valid value in the range representable for Integer values in CQL. If the input string is not formatted correctly, or cannot be interpreted as a valid Integer value, the result is false. +If the input is a Boolean, the result is true. + If the argument is null, the result is null. @@ -838,67 +883,73 @@ If the argument is null, the result is null. Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + Note that the integer value returned by this operator must be a valid value in the range representable for Integer values in CQL. If the input string is not formatted correctly, or cannot be interpreted as a valid Integer value, the result is null. +If the input is Boolean, true will result in 1, false will result in 0. + If the argument is null, the result is null. - - - The ConvertsToLong operator returns true if the value of its argument is or can be converted to a Long value. The operator accepts strings using the following format: + + + The ConvertsToLong operator returns true if the value of its argument is or can be converted to a Long value. The operator accepts strings using the following format: - (+|-)?#0 +(+|-)?#0 - Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. +Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. - See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. - Note that for this operator to return true, the input must be a valid value in the range representable for Long values in CQL. +Note that for this operator to return true, the input must be a valid value in the range representable for Long values in CQL. - If the input string is not formatted correctly, or cannot be interpreted as a valid Long value, the result is false. +If the input string is not formatted correctly, or cannot be interpreted as a valid Long value, the result is false. - If the input is a Boolean, the result is true. +If the input is a Boolean, the result is true. - If the argument is null, the result is null. - - - - - - - - The ToLong operator converts the value of its argument to a Long value. The operator accepts strings using the following format: +If the argument is null, the result is null. + + + + + + + + The ToLong operator converts the value of its argument to a Long value. The operator accepts strings using the following format: - (+|-)?#0 +(+|-)?#0 - Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. +Meaning an optional polarity indicator, followed by any number of digits (including none), followed by at least one digit. - See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. - Note that the long value returned by this operator must be a valid value in the range representable for Long values in CQL. +Note that the long value returned by this operator must be a valid value in the range representable for Long values in CQL. - If the input string is not formatted correctly, or cannot be interpreted as a valid Long value, the result is null. +If the input string is not formatted correctly, or cannot be interpreted as a valid Long value, the result is null. - If the argument is null, the result is null. - - - - - +If the argument is null, the result is null. + + + + + - The ConvertsToQuantity operator returns true if the value of its argument can be converted to a Quantity value. The operator may be used with Integer, Decimal, Ratio, or String values. + The ConvertsToQuantity operator returns true if the value of its argument is or can be converted to a Quantity value. The operator may be used with Integer, Decimal, Ratio, or String values. For String values, the operator accepts strings using the following format: (+|-)?#0(.0#)?('<unit>')? -Meaning an optional polarity indicator, followed by any number of digits (including none) followed by at least one digit, optionally followed by a decimal point, at least one digit, and any number of additional digits, all optionally followed by a unit designator as a string literal specifying a valid UCUM unit of measure. Spaces are allowed between the quantity value and the unit designator. +Meaning an optional polarity indicator, followed by any number of digits (including none) followed by at least one digit, optionally followed by a decimal point, at least one digit, and any number of additional digits, all optionally followed by a unit designator as a string literal specifying a valid UCUM unit of measure or calendar duration keyword, singular or plural. Spaces are allowed between the quantity value and the unit designator. + +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. Note that the decimal value of the quantity returned by this operator must be a valid value in the range representable for Decimal values in CQL. @@ -914,13 +965,15 @@ If the argument is null, the result is null. - The ToQuantity operator converts the value of its argument to a Quantity value. The operator may be used with Integer, Decimal, Ratio, or String values. + The ToQuantity operator converts the value of its argument to a Quantity value. The operator may be used with Integer, Decimal, Ratio, or String values. The operation does not perform any unit conversion, that capability is supported by the ConvertQuantity operator. For String values, the operator accepts strings using the following format: (+|-)?#0(.0#)?('<unit>')? -Meaning an optional polarity indicator, followed by any number of digits (including none) followed by at least one digit, optionally followed by a decimal point, at least one digit, and any number of additional digits, all optionally followed by a unit designator as a string literal specifying a valid UCUM unit of measure. Spaces are allowed between the quantity value and the unit designator. +Meaning an optional polarity indicator, followed by any number of digits (including none) followed by at least one digit, optionally followed by a decimal point, at least one digit, and any number of additional digits, all optionally followed by a unit designator as a string literal specifying a valid UCUM unit of measure or calendar duration keyword, singular or plural. Spaces are allowed between the quantity value and the unit designator. + +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. Note that the decimal value of the quantity returned by this operator must be a valid value in the range representable for Decimal values in CQL. @@ -938,7 +991,7 @@ If the argument is null, the result is null. - The ConvertsToRatio operator returns true if the value of its argument can be converted to a Ratio value. The operator accepts strings using the following format: + The ConvertsToRatio operator returns true if the value of its argument is or can be converted to a Ratio value. The operator accepts strings using the following format: <quantity>:<quantity> @@ -994,18 +1047,20 @@ If the argument is null, the result is null. - The ConvertsToString operator returns true if the value of its argument can be converted to a String value. + The ConvertsToString operator returns true if the value of its argument is or can be converted to a String value. The operator returns true if the argument is any of the following types: Boolean Integer +Long Decimal DateTime Date Time Quantity Ratio +String If the argument is null, the result is null. @@ -1019,6 +1074,7 @@ If the argument is null, the result is null. Boolean true|false Integer (-)?#0 +Long (-)?#0 Decimal (-)?#0.0# Quantity (-)?#0.0# '<unit>' Date YYYY-MM-DD @@ -1026,6 +1082,8 @@ DateTime YYYY-MM-DDThh:mm:ss.fff(+|-)hh:mm Time hh:mm:ss.fff Ratio <quantity>:<quantity> +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + If the argument is null, the result is null. @@ -1034,12 +1092,14 @@ If the argument is null, the result is null. - The ConvertsToTime operator returns true if the value of its argument can be converted to a Time value. + The ConvertsToTime operator returns true if the value of its argument is or can be converted to a Time value. For String values, the operator expects the string to be formatted using ISO-8601 time representation: hh:mm:ss.fff +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + In addition, the string must be interpretable as a valid time-of-day value. If the input string is not formatted correctly, or does not represent a valid time-of-day value, the result is false. @@ -1060,6 +1120,8 @@ For String values, the operator expects the string to be formatted using ISO-860 hh:mm:ss.fff +See the Formatting Strings topic in the CQL Reference (Appendix B) of the CQL Specification for a description of formatting strings. + In addition, the string must be interpretable as a valid time-of-day value. If the input string is not formatted correctly, or does not represent a valid time-of-day value, the result is null. @@ -1109,7 +1171,9 @@ For string values, equality is strictly lexical based on the Unicode values for For decimal values, trailing zeroes are ignored. -For quantities, this means that the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a run-time error. +For quantities, this means that the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in null. When a quantity has no units specified, it is treated as a quantity with the default unit ('1'). + +For time-valued quantities, UCUM definite-time duration quantities above days (and weeks) are not comparable to calendar duration quantities above days (and weeks). Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) results in null. For ratios, this means that the numerator and denominator must be the same, using quantity equality semantics. @@ -1137,7 +1201,9 @@ For string values, equivalence returns true if the strings are the same value wh For decimals, equivalent means the values are the same with the comparison done on values rounded to the least precision of the least precise operand; trailing zeroes after the decimal are ignored in determining precision for equivalent comparison. -For quantities, equivalent means the values are the same quantity when considering unit conversion (e.g. 100 'cm' ~ 1 'm') and using decimal equivalent semantics for the value. Note that implementations are not required to support unit conversion and so are allowed to return null for equivalence of quantities with different units. +For quantities, equivalent means the values are the same quantity when considering unit conversion (e.g. 100 'cm' ~ 1 'm') and using decimal equivalent semantics for the value. Note that implementations are not required to support unit conversion and so are allowed to return false for equivalence of quantities with different units. + +For time-valued quantities, UCUM definite-time duration quantities above days (and weeks) are considered equivalent to their calendar duration counterparts. Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to the calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) uses the approximations of 365 days in a year, and 30 days in a month. For ratios, equivalent means that the numerator and denominator represent the same ratio (e.g. 1:100 ~ 10:1000). @@ -1173,13 +1239,15 @@ The NotEqual operator is a shorthand for invocation of logical negation of the E The Less operator returns true if the first argument is less than the second argument. -For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a run-time error. +For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a null. When a quantity has no units specified, it is treated as a quantity with the default unit ('1'). + +For time-valued quantities, the UCUM definite-quantity durations above days (and weeks) are not comparable to calendar durations. Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) results in null. For Date, Time, and DateTime values, the comparison is performed by considering each precision in order, beginning with years (or hours for time values). If the values are the same, comparison proceeds to the next precision; if the first value is less than the second, the result is true; if the first value is greater than the second, the result is false; if one input has a value for the precision and the other does not, the comparison stops and the result is null; if neither input has a value for the precision or the last precision has been reached, the comparison stops and the result is false. For the purposes of comparison, seconds and milliseconds are combined as a single precision using a decimal, with decimal comparison semantics. If either argument is null, the result is null. -The Less operator is defined for the Integer, Decimal, String, Date, DateTime, Time, and Quantity types. +The Less operator is defined for the Integer, Long, Decimal, String, Date, DateTime, Time, and Quantity types. Note that relative ratio comparisons are not directly supported due to the variance of uses within healthcare. See the discussion in Ratio Operators in the Author's Guide for more information. @@ -1191,9 +1259,11 @@ Note that relative ratio comparisons are not directly supported due to the varia The Greater operator returns true if the first argument is greater than the second argument. -The Greater operator is defined for the Integer, Decimal, String, Date, DateTime, Time, and Quantity types. +The Greater operator is defined for the Integer, Long, Decimal, String, Date, DateTime, Time, and Quantity types. -For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a run-time error. +For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in null. When a quantity has no units specified, it is treated as a quantity with the default unit ('1'). + +For time-valued quantities, the UCUM definite-quantity durations above days (and weeks) are not comparable to calendar durations. Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) results in null. For Date, Time, and DateTime values, the comparison is performed by considering each precision in order, beginning with years (or hours for time values). If the values are the same, comparison proceeds to the next precision; if the first value is greater than the second, the result is true; if the first value is less than the second, the result is false; if one input has a value for the precision and the other does not, the comparison stops and the result is null; if neither input has a value for the precision or the last precision has been reached, the comparison stops and the result is false. For the purposes of comparison, seconds and milliseconds are combined as a single precision using a decimal, with decimal comparison semantics. @@ -1211,9 +1281,11 @@ Note that relative ratio comparisons are not directly supported due to the varia The LessOrEqual operator returns true if the first argument is less than or equal to the second argument. -The LessOrEqual operator is defined for the Integer, Decimal, String, Date, DateTime, Time, and Quantity types. +The LessOrEqual operator is defined for the Integer, Long, Decimal, String, Date, DateTime, Time, and Quantity types. + +For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a null. When a quantity has no units specified, it is treated as a quantity with the default unit ('1'). -For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a run-time error. +For time-valued quantities, the UCUM definite-quantity durations above days (and weeks) are not comparable to calendar durations. Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) results in null. For Date, Time, and DateTime values, the comparison is performed by considering each precision in order, beginning with years (or hours for time values). If the values are the same, comparison proceeds to the next precision; if the first value is less than the second, the result is true; if the first value is greater than the second, the result is false; if one input has a value for the precision and the other does not, the comparison stops and the result is null; if neither input has a value for the precision or the last precision has been reached, the comparison stops and the result is true. For the purposes of comparison, seconds and milliseconds are combined as a single precision using a decimal, with decimal comparison semantics. @@ -1231,9 +1303,11 @@ Note that relative ratio comparisons are not directly supported due to the varia The GreaterOrEqual operator returns true if the first argument is greater than or equal to the second argument. -The GreaterOrEqual operator is defined for the Integer, Decimal, String, Date, DateTime, Time, and Quantity types. +The GreaterOrEqual operator is defined for the Integer, Long, Decimal, String, Date, DateTime, Time, and Quantity types. -For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a run-time error. +For comparisons involving quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' are comparable, but units of 'cm2' and 'cm' are not. Attempting to operate on quantities with invalid units will result in a null. When a quantity has no units specified, it is treated as a quantity with the default unit ('1'). + +For time-valued quantities, the UCUM definite-quantity durations above days (and weeks) are not comparable to calendar durations. Definite-time duration unit conversions shall be performed as specified in ISO-8601, while calendar-time duration unit conversions shall be performed according to calendar duration semantics. In particular, unit conversion between variable length calendar durations (i.e. years and months) and definite-time durations (i.e. days or below) results in null. For Date, Time, and DateTime values, the comparison is performed by considering each precision in order, beginning with years (or hours for time values). If the values are the same, comparison proceeds to the next precision; if the first value is greater than the second, the result is true; if the first value is less than the second, the result is false; if one input has a value for the precision and the other does not, the comparison stops and the result is null; if neither input has a value for the precision or the last precision has been reached, the comparison stops and the result is true. For the purposes of comparison, seconds and milliseconds are combined as a single precision using a decimal, with decimal comparison semantics. @@ -1254,7 +1328,7 @@ Note that relative ratio comparisons are not directly supported due to the varia When adding quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' can be added, but units of 'cm2' and 'cm' cannot. The unit of the result will be the most granular unit of either input. Attempting to operate on quantities with invalid units will result in a run-time error. -The Add operator is defined for the Integer, Decimal, and Quantity types. In addition, a time-valued Quantity can be added to a Date, DateTime or Time using this operator. +The Add operator is defined for the Integer, Long, Decimal, and Quantity types. In addition, a time-valued Quantity can be added to a Date, DateTime or Time using this operator. For Date, DateTime, and Time values, the operator returns the value of the first argument, incremented by the time-valued quantity, respecting variable length periods for calendar years and months. @@ -1264,9 +1338,11 @@ For DateTime values, the quantity unit must be one of years, months, weeks, days For Time values, the quantity unit must be one of hours, minutes, seconds, or milliseconds. -Note that as with any Date, Time, or DateTime operations, temporal units may be specified with either singular, plural, or UCUM units. +Note that as with any Date, Time, or DateTime operations, temporal units may be specified with either singular, plural, or UCUM units. However, to avoid the potential confusion of calendar-based date and time arithmetic with definite-duration date and time arithmetic, it is an error to attempt to add a definite-duration time-valued unit above days (and weeks), a calendar duration must be used. + +For precisions above seconds, any decimal portion of the time-valued quantity is ignored, since date/time arithmetic above seconds is performed with calendar duration semantics. -The operation is performed by converting the time-based quantity to the highest specified granularity in the first argument (truncating any resulting decimal portion) and then adding it to the first argument. +For partial date/time values where the time-valued quantity is more precise than the partial date/time, the operation is performed by converting the time-based quantity to the highest specified granularity in the first argument (truncating any resulting decimal portion) and then adding it to the first argument. If either argument is null, the result is null. @@ -1282,7 +1358,7 @@ If the result of the addition cannot be represented (i.e. arithmetic overflow), When subtracting quantities, the dimensions of each quantity must be the same, but not necessarily the unit. For example, units of 'cm' and 'm' can be subtracted, but units of 'cm2' and 'cm' cannot. The unit of the result will be the most granular unit of either input. Attempting to operate on quantities with invalid units will result in a run-time error. -The Subtract operator is defined for the Integer, Decimal, and Quantity types. In addition, a time-valued Quantity can be subtracted from a Date, DateTime, or Time using this operator. +The Subtract operator is defined for the Integer, Long, Decimal, and Quantity types. In addition, a time-valued Quantity can be subtracted from a Date, DateTime, or Time using this operator. For Date, DateTime, Time values, the operator returns the value of the first argument, decremented by the time-valued quantity, respecting variable length periods for calendar years and months. @@ -1292,7 +1368,11 @@ For DateTime values, the quantity unit must be one of years, months, weeks, days For Time values, the quantity unit must be one of hours, minutes, seconds, or milliseconds. -The operation is performed by converting the time-based quantity to the highest specified granularity in the first argument (truncating any resulting decimal portion) and then adding it to the first argument. +Note that as with any Date, Time, or DateTime operations, temporal units may be specified with either singular, plural, or UCUM units. However, to avoid the potential confusion of calendar-based date and time arithmetic with definite-duration date and time arithmetic, it is an error to attempt to subtract a definite-duration time-valued unit above days (and weeks), a calendar duration must be used. + +For precisions above seconds, any decimal portion of the time-valued quantity is ignored, since date/time arithmetic above seconds is performed with calendar duration semantics. + +For partial date/time values where the time-valued quantity is more precise than the partial date/time, the operation is performed by converting the time-based quantity to the highest specified granularity in the first argument (truncating any resulting decimal portion) and then subtracting it from the first argument. If either argument is null, the result is null. @@ -1312,7 +1392,7 @@ If either argument is null, the result is null. If the result of the operation cannot be represented, the result is null. -The Multiply operator is defined for the Integer, Decimal and Quantity types. +The Multiply operator is defined for the Integer, Long, Decimal and Quantity types. @@ -1342,7 +1422,9 @@ If either argument is null, the result is null. If the result of the operation cannot be represented, or the right argument is 0, the result is null. -The TruncatedDivide operator is defined for the Integer and Decimal types. +The TruncatedDivide operator is defined for the Integer, Long, Decimal, and Quantity types. + +For TruncatedDivide operations involving quantities, the resulting quantity will have the appropriate unit. @@ -1356,7 +1438,9 @@ If either argument is null, the result is null. If the result of the modulo cannot be represented, or the right argument is 0, the result is null. -The Modulo operator is defined for the Integer and Decimal types. +The Modulo operator is defined for the Integer, Long, Decimal, and Quantity types. + +For Modulo operations involving quantities, the resulting quantity will have the appropriate unit. @@ -1402,7 +1486,7 @@ If the argument is null, the result is null. If the result of taking the absolute value of the argument cannot be represented (e.g. Abs(minimum Integer)), the result is null. -The Abs operator is defined for the Integer, Decimal, and Quantity types. +The Abs operator is defined for the Integer, Long, Decimal, and Quantity types. @@ -1418,7 +1502,7 @@ If the argument is null, the result is null. If the result of negating the argument cannot be represented (e.g. -(minimum Integer)), the result is null. -The Negate operator is defined for the Integer, Decimal, and Quantity types. +The Negate operator is defined for the Integer, Long, Decimal, and Quantity types. @@ -1493,10 +1577,12 @@ If the result of the operation cannot be represented, the result is null. The Successor operator returns the successor of the argument. For example, the successor of 1 is 2. If the argument is already the maximum value for the type, a run-time error is thrown. -The Successor operator is defined for the Integer, Decimal, Date, DateTime, and Time types. +The Successor operator is defined for the Integer, Long, Decimal, Date, DateTime, and Time types. For Integer, Successor is equivalent to adding 1. +For Long, Successor is equivalent to adding 1L. + For Decimal, Successor is equivalent to adding the minimum precision value for the Decimal type, or 10^-08. For Date, DateTime, and Time values, Successor is equivalent to adding a time-unit quantity for the lowest specified precision of the value. For example, if the DateTime is fully specified, Successor is equivalent to adding 1 millisecond; if the DateTime is specified to the second, Successor is equivalent to adding one second, etc. @@ -1513,10 +1599,12 @@ If the result of the operation cannot be represented, the result is null. The Predecessor operator returns the predecessor of the argument. For example, the predecessor of 2 is 1. If the argument is already the minimum value for the type, a run-time error is thrown. -The Predecessor operator is defined for the Integer, Decimal, Date, DateTime, and Time types. +The Predecessor operator is defined for the Integer, Long, Decimal, Date, DateTime, and Time types. For Integer, Predecessor is equivalent to subtracting 1. +For Long, Predecessor is equivalent to subtracting 1L. + For Decimal, Predecessor is equivalent to subtracting the minimum precision value for the Decimal type, or 10^-08. For Date, DateTime, and Time values, Predecessor is equivalent to subtracting a time-unit quantity for the lowest specified precision of the value. For example, if the DateTime is fully specified, Predecessor is equivalent to subtracting 1 millisecond; if the DateTime is specified to the second, Predecessor is equivalent to subtracting one second, etc. @@ -1533,10 +1621,12 @@ If the result of the operation cannot be represented, the result is null. The MinValue operator returns the minimum representable value for the given type. -The MinValue operator is defined for the Integer, Decimal, Date, DateTime, and Time types. +The MinValue operator is defined for the Integer, Long, Decimal, Date, DateTime, and Time types. For Integer, MinValue returns the minimum signed 32-bit integer, -(2^31). +For Long, MinValue returns the minimum signed 64-bit integer, -(2^63). + For Decimal, MinValue returns the minimum representable Decimal value, (-10^28 + 1) / 10^8 (-99999999999999999999.99999999). For Date, MinValue returns the minimum representable Date value, Date(1, 1, 1). @@ -1559,10 +1649,12 @@ Note that implementations may choose to represent the minimum DateTime value usi The MaxValue operator returns the maximum representable value for the given type. -The MaxValue operator is defined for the Integer, Decimal, Date, DateTime, and Time types. +The MaxValue operator is defined for the Integer, Long, Decimal, Date, DateTime, and Time types. For Integer, MaxValue returns the maximum signed 32-bit integer, 2^31 - 1. +For Long, MaxValue returns the maximum signed 64-bit integer, 2^63 - 1. + For Decimal, MaxValue returns the maximum representable Decimal value, (10^28 - 1) / 10^8 (99999999999999999999.99999999). For Date, MaxValue returns the maximum representable Date value, Date(9999, 12, 31). @@ -1947,13 +2039,11 @@ If the argument is null, the result is null. - - The TimezoneFrom operator returns the timezone offset of the argument. + DEPRECATED (as of 1.4): The TimezoneFrom operator returns the timezone offset of the argument. - If the argument is null, the result is null. +If the argument is null, the result is null. @@ -2032,6 +2122,8 @@ At least one component must be specified, and no component may be specified at a At least one component other than timezoneOffset must be specified, and no component may be specified at a precision below an unspecified precision. For example, hour may be null, but if it is, minute, second, and millisecond must all be null as well. +Although the milliseconds are specified with a separate component, seconds and milliseconds are combined and represented as a Decimal for the purposes of comparison. + If timezoneOffset is not specified, it is defaulted to the timezone offset of the evaluation request. @@ -2053,7 +2145,9 @@ If timezoneOffset is not specified, it is defaulted to the timezone offset of th The Time operator constructs a time value from the given components. -At least one component must be specified, and no component may be specified at a precision below an unspecified precision. For example, minute may be null, but if it is, second, and millisecond must all be null as well. +At least one component must be specified, and no component may be specified at a precision below an unspecified precision. For example, minute may be null, but if it is, second, and millisecond must all be null as well. + +Although the milliseconds are specified with a separate component, seconds and milliseconds are combined and represented as a [.id]#Decimal# for the purposes of comparison. @@ -2229,7 +2323,7 @@ There are two overloads of this operator: For the List, T overload, this operator returns true if the given element is in the list, using equality semantics. -For the Interval, T overload, this operator returns true if the given point is greater than or equal to the starting point of the interval, and less than or equal to the ending point of the interval. For open interval boundaries, exclusive comparison operators are used. For closed interval boundaries, if the interval boundary is null, the result of the boundary comparison is considered true. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. +For the Interval, T overload, this operator returns true if the given point is equal to the starting or ending point of the interval, or greater than the starting point and less than the ending point. For open interval boundaries, exclusive comparison operators are used. For closed interval boundaries, if the interval boundary is null, the result of the boundary comparison is considered true. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. If the first argument is null, the result is false. If the second argument is null, the result is null. @@ -2252,7 +2346,7 @@ For the List, T overload, this operator returns true if the given element is in For the Interval, T overload, this operator returns true if the given point is greater than the starting point of the interval, and less than the ending point of the interval, as determined by the Start and End operators. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. -If either argument is null, the result is null. +If the first argument is null, the result is false. If the second argument is null, the result is null. @@ -2271,7 +2365,7 @@ There are two overloads of this operator: For the T, List overload, this operator returns true if the given element is in the given list, using equality semantics. -For the T, Interval overload, this operator returns true if the given point is greater than or equal to the starting point of the interval, and less than or equal to the ending point of the interval. For open interval boundaries, exclusive comparison operators are used. For closed interval boundaries, if the interval boundary is null, the result of the boundary comparison is considered true. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. +For the T, Interval overload, this operator returns true if the given point is equal to the starting or ending point of the interval, or greater than the starting point and less than the ending point. For open interval boundaries, exclusive comparison operators are used. For closed interval boundaries, if the interval boundary is null, the result of the boundary comparison is considered true. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. If the first argument is null, the result is null. If the second argument is null the result is false. @@ -2294,7 +2388,7 @@ For the T, List overload, this operator returns if the given element is in the g For the T, Interval overload, this operator returns true if the given point is greater than the starting point, and less than the ending point of the interval, as determined by the Start and End operators. If precision is specified and the point type is a Date, DateTime, or Time type, comparisons used in the operation are performed at the specified precision. -If either argument is null, the result is null. +If the first argument is null, the result is null. If the second argument is null the result is false. @@ -2597,6 +2691,8 @@ The operation is performed by combining successive intervals in the input that e The per argument determines the precision at which the collapse is computed and must be a quantity-valued expression compatible with the interval point type. For numeric intervals, this means a quantity with the default unit '1' (not to be confused with the quantity value, which may be any valid positive decimal). For Date-, DateTime-, and Time-valued intervals, this means a quantity with a temporal unit (e.g., 'year', 'month', etc). +Conceptually, the per argument to the collapse operator partitions the value-space for the operation into units of size 'per', and the intervals will be collapsed aligning with those partitions. Note that the 'per' partitions start from the starting boundary of the first input interval, ordered. + If the per argument is null, a per value will be constructed based on the coarsest precision of the boundaries of the intervals in the input set. For example, a list of DateTime-based intervals where the boundaries are a mixture of hours and minutes will collapse at the hour precision. If the list of intervals is empty, the result is empty. If the list of intervals contains a single interval, the result is a list with that interval. If the list of intervals contains nulls, they will be excluded from the resulting list. @@ -2609,14 +2705,18 @@ If the source argument is null, the result is null. - The Expand operator returns the set of intervals of size per for all the ranges present in the given list of intervals. + The Expand operator returns the set of intervals of size per for all the ranges present in the given list of intervals, or the list of points covering the range of the given interval, if invoked on a single interval. The per argument determines the size of the resulting intervals and must be a quantity-valued expression compatible with the interval point type. For numeric intervals, this means a quantity with the default unit '1' (not to be confused with the quantity value, which may be any valid positive decimal). For Date-, DateTime-, and Time-valued intervals, this means a quantity with a temporal unit (e.g., 'year', 'month', etc). +Conceptually, the per argument to the expand operator partitions the value-space for the operation into units of size 'per', and the intervals will be expanded aligning with those partitions. Note that the 'per' partitions start from the starting boundary of the first input interval, ordered. + If the per argument is null, a per value will be constructed based on the coarsest precision of the boundaries of the intervals in the input set. For example, a list of DateTime-based intervals where the boundaries are a mixture of hours and minutes will expand at the hour precision. Note that if the values in the intervals are more precise than the per quantity, the more precise values will be truncated to the precision specified by the per quantity. +If the input argument is an interval, rather than a list of intervals, the result is a list of points, rather than a list of intervals. In this case, the calculation is performed the same way, but the starting point of each resulting interval is returned, rather than the interval. + If the list of intervals is empty, the result is empty. If the list of intervals contains nulls, they will be excluded from the resulting list. If the source argument is null, the result is null. @@ -3319,6 +3419,21 @@ Property expressions can also be used to access the individual points and closed + + + The AggregateClause element defines the result of the query in terms of an aggregation expression performed for each item in the query. + + + + + + + + + + + + The Query operator represents a clause-based query. The result of the query is determined by the type of sources included, as well as the clauses used in the query. @@ -3331,6 +3446,7 @@ Property expressions can also be used to access the individual points and closed + diff --git a/engine/src/main/resources/cql-lm/schema/elm/library.xsd b/engine/src/main/resources/cql-lm/schema/elm/library.xsd index 386acce3d..9d7f4a462 100644 --- a/engine/src/main/resources/cql-lm/schema/elm/library.xsd +++ b/engine/src/main/resources/cql-lm/schema/elm/library.xsd @@ -7,9 +7,9 @@ VersionedIdentifier is composed of three parts: (1) an optional system, or - namespace, which provides a globally unique, stable scope for the identifier, - (2) an identifier which identifies the set of all versions of a given resource, and - (3) the actual version of the instance of interest in this set. The VersionedIdentifier + namespace, which provides a globally unique, stable scope for the identifier, + (2) an identifier which identifies the set of all versions of a given resource, and + (3) the actual version of the instance of interest in this set. The VersionedIdentifier therefore points to an individual 'versioned' instance of a resource such as the third version of a library. @@ -70,6 +70,16 @@ + + + The ContextDef type defines a context definition statement. Note that this is a placeholder for the context statement within the library. The effect of the context definition is applied by the translator to the definitions that follow. + + + + + + + library represents a serialized library of CQL-Epression Logic @@ -177,9 +187,19 @@ + + + The contexts defined within this library. + + + + + + + - The statements section contains the expression and function + The statements section contains the expression and function definitions for the library. diff --git a/engine/src/main/resources/cql-lm/schema/elm/types.xsd b/engine/src/main/resources/cql-lm/schema/elm/types.xsd index 8c5bc8d52..2caaed065 100644 --- a/engine/src/main/resources/cql-lm/schema/elm/types.xsd +++ b/engine/src/main/resources/cql-lm/schema/elm/types.xsd @@ -45,7 +45,7 @@ - + diff --git a/engine/src/main/resources/cql-lm/schema/model/modelinfo.xsd b/engine/src/main/resources/cql-lm/schema/model/modelinfo.xsd index 9dd70e27f..f078d4f65 100644 --- a/engine/src/main/resources/cql-lm/schema/model/modelinfo.xsd +++ b/engine/src/main/resources/cql-lm/schema/model/modelinfo.xsd @@ -5,6 +5,95 @@ The modelInfo element defines metadata associated with a particular model to allow it to be used by CQL. + + + Defines an available context type for the model. + + + + + Specifies the type for the context. + + + + + + Specifies the name of the context. This is the name that will be referenced by context statements within CQL. + + + + + Specifies the key elements, in order and semi-colon delimited, of the context type that form the reference key for the context. The elements taken together must form a unique identifier for instances of the context. + + + + + Specifies the name of the birthDateElement of the context type. + + + + + + Defines the relationship of a class to the context. + + + + Specifies the target context of the relationship. + + + + + Specifies the related key elements, in order and semi-colon delimited, of the type that contain the reference to the context. There must be the same number of elements, and in the same order, as the target context. + + + + + + Defines a possible search path for a ClassInfo within the model. + + + + + Specifies the type of the search parameter as a type specifier + + + + + + Defines the name of the search info + + + + + Defines the formal path to search values within the ClassInfo. In the simplest case, this is the same as the name. + + + + + Specifies the type of the search parameter + + + + + Provides an optional, user-friendly label for the search path that can be used to reference the search path from CQL. + + + + + Specifies a short description of the search path + + + + + Provides a complete, detailed, markdown-capable definition of the search path + + + + + Provides markdown-capable additional comments on the use of the search path + + + The ModelInfo type defines the metadata associated with a particular model to enable it to be used by the CQL translator. Note that none of the information specified here is required, it just enables some convenient shorthands within the language. @@ -13,6 +102,7 @@ + @@ -29,29 +119,39 @@ The url attribute specifies the xml namespace associated with the model, and is used by the CQL translator to establish the url used to reference types from the model schema within an ELM document. + + + Specifies a target url that identifies the xml namespace associated with the target model in the underlying representation. + + + + + Specifies a target version that identifies the version of the xml namespace associated with the target model in the underlying representation. + + The schemaLocation attribute is used by the CQL translator to output the schemaLocation of the xsd for the data model in the resulting ELM document. - + The targetQualifier attribute is used to specify the namespace qualifier that should be used when referencing types of the model within the ELM document. - The patientClassName attribute specifies the name of the Patient class within the model. + DEPRECATED: The patientClassName attribute specifies the name of the Patient class within the model. - The patientClassIdentifier attribute specifies a unique name for the Patient class that may be independent of the name. In FHIR, this corresponds to the Patient profile identifier. + DEPRECATED: The patientClassIdentifier attribute specifies a unique name for the Patient class that may be independent of the name. In FHIR, this corresponds to the Patient profile identifier. - The patientBirthDatePropertyName attribute specifies the name of the birthdate property on the Patient model. + DEPRECATED: The patientBirthDatePropertyName attribute specifies the name of the birthdate property on the Patient model. @@ -64,6 +164,47 @@ The strictRetrieveTyping attribute indicates whether or not retrieve expressions against the model should be semantically validated. If this attribute is not present or false, code and date range filters within the retrieve are not type validated, allowing the data access layer to perform late binding of content within the retrieve. If the attribute is true, code and date range filters within the retrieve are type validated. + + + Specifies the default context to be used by CQL expressions for this model. + + + + + + The BindingStrength type describes possible strengths of a binding specification, Required, Extensible, Preferred, and Example. + + + + + + + + + + + Specifies binding information for an element + + + + Specifies a formal name for the binding, suitable for use as a class name in generated targets + + + + + Specifies a user-friendly description of the the binding, suitable for use as a display description for possible values of the element + + + + + Specifies the strength of the binding, required, extensible, preferred, or example + + + + + Specifies the target value set for the binding (i.e. the value set that specifies thes et of possible values for the element) + + @@ -73,6 +214,12 @@ + + + + A constraint that applies to this class element. The evaluation context for the constraint is an instance of the class + + @@ -87,6 +234,93 @@ Indicates that the starting index for a list-valued element is one. By default, lists are zero-based. + + + Specifies a path that can be used instead of the name of the element to access the value for this element in the underlying representation. + + + + + Specifies a user-friendly label for the element + + + + + Specifies a short description of the element + + + + + Provides a complete, detailed, markdown-capable definition of the element + + + + + Provides markdown-capable additional comments on the use of the element + + + + + Specifies the minimum cardinality of the element. For non-list-valued elements, this is 0 or 1, indicating whether a value is required (1). For list-valued elements, this is an integer defining the minimum cardinality of the list value. + + + + + Specifies the maximum cardinality of the element. For non-list-valued elements, this is 0 or 1, indicating where a value is prohibited (0). For list-valued elements, this is an integer definined the maximum cardinality of the list, or a '*' indicating the list has no maximum number of elements. If this value is an integer, it must be greater than or equal to the value of the min attribute. + + + + + Specifies whether this element is relevant for the use case the class in which it appears is supporting + + + + + + The ExpressionInfo type models an expression in some language. + + + + Specifies the language of the expression as a media type (e.g. text/cql-expression) + + + + + The expression in the language specified by the language attribute + + + + + + The ConstraintInfo type models the definition of a constraint which can then be associated with a class info, class info element, or other model element. + + + + + The formal expression of the constraint in some formal language. Multiple expressions are considered equivalent formulations in alternate languages (i.e. there can be only one expression of a given language for the constraint). + + + + + + The name of the constraint, unique within the context of use for the constraint. + + + + + The severity of the constraint, one of Info, Warning, or Error. + + + + + A description of the constraint. + + + + + The message that is returned as a result of this constraint being violated. The message may be templatized through the use of double-braces ({{ }}). + + @@ -95,7 +329,28 @@ + + + The generic parameters defined by a generic class. In generic class + SomeClass<S extends Type1, T>, 'S extends Type1' and 'T' are both generic + parameters. + + + + + + + + + An expression that describes values of this class if they can be inferred from other data elements. If multiple expressions are provided, they must be isopragmatic (i.e. only one expression of each language is allowed) + + + + + A constraint that applies to the class. The evaluation context for the constraint is an instance of the class. + + @@ -117,6 +372,26 @@ The label attribute specifies the name of the class as it is referenced from CQL. This is a user-friendly identifier for the class that can be used within CQL as an alternative way to reference the class. + + + Specifies a short description of the class + + + + + Provides a complete, detailed, markdown-capable definition of the class + + + + + Provides markdown-capable additional comments on the use of the class + + + + + Specifies the name of the type in the underlying representation. + + The retrievable attribute specifies whether the class can be used within a retrieve statement. This flag is intended to allow the implementation to control whether or not the class can be used as a data access point for the data model. @@ -127,6 +402,11 @@ The primaryCodePath attribute specifies the path relative to the class that should be used to perform code filtering when a retrieve does not specify a code path. + + + The primaryValueSetPath attribute specifies the path relative to the class that should be used to perform alternative value set matching when source data does not have a code defined. + + @@ -149,6 +429,11 @@ Name is the unqualified name of the type within this model. + + + Specifies the name of the type in the underlying representation. + + @@ -233,6 +518,11 @@ + + + Specifies the globally unique url for the model, this is equivalent to the url element of the referenced model info. + + @@ -280,4 +570,85 @@ + + + A type which is generic class parameter such as T in MyGeneric<T extends + SomeType>. + + + + + + + + + + + A type which is replacing a class parameter such as T in MyClass extends MyGeneric<AValidType>. + + + + + + + + + The name of the parameter that is bound to a valid type based on the parameter + definition, such as 'T'. + + + + + + The type bound to the parameter (e.g., 'T'). + + + + + + + + A generic class parameter such as T in MyGeneric<T extends SomeType>. + + + + + + + + The name of the parameter such as T,K, etc... + + + + + One of NONE, CLASS, VALUE, TUPLE, INTERVAL, CHOICE, TYPE + + + + + The type this parameter should be assignable from (i.e., extend). + + + + + + TupleTypeSpecifierElement defines the name and type of a single element within a TupleTypeSpecifier. + + + + + + + + + TupleTypeSpecifier defines the possible elements of a tuple. + + + + + + + + + diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlEngineTests.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlEngineTests.java index 1d82536dc..7a7ed3ac2 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlEngineTests.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlEngineTests.java @@ -15,10 +15,10 @@ import java.util.List; import java.util.Map; -import org.cqframework.cql.cql2elm.CqlTranslatorException; +import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.CqlTranslatorOptions; import org.cqframework.cql.cql2elm.LibraryManager; -import org.cqframework.cql.cql2elm.model.TranslatedLibrary; +import org.cqframework.cql.cql2elm.model.CompiledLibrary; import org.cqframework.cql.elm.execution.Library; import org.testng.annotations.Test; @@ -58,8 +58,6 @@ public void test_simpleLibraryWithParam_returnsParamValue() throws IOException { parameters.put("IntValue", 10); EvaluationResult result = engine.evaluate("Test", parameters); - - Object expResult = result.forExpression("X"); assertThat(expResult, is(10)); @@ -121,20 +119,16 @@ public void test_twoLibraries_expressionsForEach() throws IOException { libraries.put(toElmIdentifier("Test", "1.0.0"), "library Test version '1.0.0'\ninclude Common version '1.0.0' named \"Common\"\ndefine X:\n5+5\ndefine Y: 2 + 2\ndefine W: \"Common\".Z + 5"); - LibraryManager libraryManager = this.toLibraryManager(libraries); - List errors = new ArrayList<>(); - List executableLibraries = new ArrayList<>(); + List errors = new ArrayList<>(); + List executableLibrariesJson = new ArrayList<>(); for (org.hl7.elm.r1.VersionedIdentifier id : libraries.keySet()) { - TranslatedLibrary translated = libraryManager.resolveLibrary(id, CqlTranslatorOptions.defaultOptions(), errors); - String json = this.convertToJson(translated.getLibrary()); - executableLibraries.add(this.readJson(json)); + CompiledLibrary compiled = libraryManager.resolveLibrary(id, CqlTranslatorOptions.defaultOptions(), errors); + executableLibrariesJson.add(this.readJson(this.convertToJson(compiled.getLibrary()))); } - LibraryLoader libraryLoader = new InMemoryLibraryLoader(executableLibraries); - - CqlEngine engine = new CqlEngine(libraryLoader); - + // Testing JSON Export/Import + CqlEngine engine = new CqlEngine(new InMemoryLibraryLoader(executableLibrariesJson)); EvaluationResult result = engine.evaluate("Test", new HashSet<>(Arrays.asList("X", "Y", "W"))); assertNotNull(result); diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlErrorSuiteTest.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlErrorSuiteTest.java new file mode 100644 index 000000000..8a5732e94 --- /dev/null +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlErrorSuiteTest.java @@ -0,0 +1,110 @@ +package org.opencds.cqf.cql.engine.execution; + +import org.cqframework.cql.cql2elm.CqlCompilerException; +import org.cqframework.cql.cql2elm.CqlTranslator; +import org.cqframework.cql.cql2elm.LibraryManager; +import org.cqframework.cql.cql2elm.ModelManager; +import org.cqframework.cql.elm.execution.ExpressionDef; +import org.cqframework.cql.elm.execution.Library; +import org.cqframework.cql.elm.tracking.TrackBack; +import org.fhir.ucum.UcumEssenceService; +import org.fhir.ucum.UcumException; +import org.fhir.ucum.UcumService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; + +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URLDecoder; +import java.time.ZonedDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.TimeZone; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +public class CqlErrorSuiteTest { + + private static final Logger logger = LoggerFactory.getLogger(CqlErrorSuiteTest.class); + + private ExpressionDef expression; + private Context context; + + @Factory(dataProvider = "dataMethod") + public CqlErrorSuiteTest(Context context, ExpressionDef expression) { + this.expression = expression; + this.context = context; + } + + @DataProvider + public static Object[][] dataMethod() throws UcumException, IOException { + //TODO: Remove this comment when portable/CqlErrorTestSuite.cql has real tests. + String[] listOfFiles = { + // "portable/CqlErrorTestSuite.cql", + }; + + List testsToRun = new ArrayList<>(); + for (String file: listOfFiles) { + Library library = translate(file); + Context context = new Context(library, ZonedDateTime.of(2018, 1, 1, 7, 0, 0, 0, TimeZone.getDefault().toZoneId())); + if (library.getStatements() != null) { + for (ExpressionDef expression : library.getStatements().getDef()) { + testsToRun.add(new Object[] { + context, + expression + }); + } + } + } + return testsToRun.toArray(new Object[testsToRun.size()][]); + } + + // This test is for the various CQL operators + @Test + public void testErrorSuite() throws IOException, UcumException { + try { + expression.evaluate(context); + logger.error("Test " + expression.getName() + " should result in an error"); + Assert.fail(); + } + catch (Exception e) { + // pass + logger.info(expression.getName() + " TEST PASSED"); + } + } + + private static Library translate(String file) throws UcumException, IOException { + ModelManager modelManager = new ModelManager(); + LibraryManager libraryManager = new LibraryManager(modelManager); + UcumService ucumService = new UcumEssenceService(UcumEssenceService.class.getResourceAsStream("/ucum-essence.xml")); + + File cqlFile = new File(URLDecoder.decode(CqlErrorSuiteTest.class.getResource(file).getFile(), "UTF-8")); + + CqlTranslator translator = CqlTranslator.fromFile(cqlFile, modelManager, libraryManager, ucumService); + + if (translator.getErrors().size() > 0) { + System.err.println("Translation failed due to errors:"); + ArrayList errors = new ArrayList<>(); + for (CqlCompilerException error : translator.getErrors()) { + TrackBack tb = error.getLocator(); + String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", + tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); + System.err.printf("%s %s%n", lines, error.getMessage()); + errors.add(lines + error.getMessage()); + } + throw new IllegalArgumentException(errors.toString()); + } + + assertThat(translator.getErrors().size(), is(0)); + + String json = translator.toJson(); + + return JsonCqlLibraryReader.read(new StringReader(json)); + } +} diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlExecutionTestBase.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlExecutionTestBase.java index e6b4ad0a6..c34b699a3 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlExecutionTestBase.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlExecutionTestBase.java @@ -11,10 +11,7 @@ import java.util.HashMap; import java.util.Map; -import org.cqframework.cql.cql2elm.CqlTranslator; -import org.cqframework.cql.cql2elm.CqlTranslatorException; -import org.cqframework.cql.cql2elm.LibraryManager; -import org.cqframework.cql.cql2elm.ModelManager; +import org.cqframework.cql.cql2elm.*; import org.cqframework.cql.elm.execution.Library; import org.cqframework.cql.elm.tracking.TrackBack; import org.fhir.ucum.UcumEssenceService; @@ -56,18 +53,18 @@ public void beforeEachTestMethod() throws IOException, UcumException { try { File cqlFile = new File(URLDecoder.decode(this.getClass().getResource(fileName + ".cql").getFile(), "UTF-8")); - ArrayList options = new ArrayList<>(); - options.add(CqlTranslator.Options.EnableDateRangeOptimization); - options.add(CqlTranslator.Options.EnableAnnotations); - options.add(CqlTranslator.Options.EnableLocators); + ArrayList options = new ArrayList<>(); + options.add(CqlTranslatorOptions.Options.EnableDateRangeOptimization); + options.add(CqlTranslatorOptions.Options.EnableAnnotations); + options.add(CqlTranslatorOptions.Options.EnableLocators); CqlTranslator translator = CqlTranslator.fromFile(cqlFile, getModelManager(), getLibraryManager(), ucumService, - options.toArray(new CqlTranslator.Options[options.size()])); + options.toArray(new CqlTranslatorOptions.Options[options.size()])); if (translator.getErrors().size() > 0) { System.err.println("Translation failed due to errors:"); ArrayList errors = new ArrayList<>(); - for (CqlTranslatorException error : translator.getErrors()) { + for (CqlCompilerException error : translator.getErrors()) { TrackBack tb = error.getLocator(); String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); @@ -82,7 +79,7 @@ public void beforeEachTestMethod() throws IOException, UcumException { jsonFile = new File(cqlFile.getParent(), fileName + ".json"); jsonFile.createNewFile(); - String json = translator.toJxson(); + String json = translator.toJson(); PrintWriter pw = new PrintWriter(jsonFile, "UTF-8"); pw.println(json); diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTestSuite.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlInternalTypeRepresentationSuiteTest.java similarity index 87% rename from engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTestSuite.java rename to engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlInternalTypeRepresentationSuiteTest.java index 21ff03199..c35b7653c 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTestSuite.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlInternalTypeRepresentationSuiteTest.java @@ -1,84 +1,34 @@ package org.opencds.cqf.cql.engine.execution; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; - -import java.io.File; -import java.io.IOException; -import java.io.StringReader; -import java.math.BigDecimal; -import java.net.URLDecoder; -import java.time.ZonedDateTime; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.TimeZone; - +import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.CqlTranslator; -import org.cqframework.cql.cql2elm.CqlTranslatorException; import org.cqframework.cql.cql2elm.LibraryManager; import org.cqframework.cql.cql2elm.ModelManager; -import org.cqframework.cql.elm.execution.ExpressionDef; -import org.cqframework.cql.elm.execution.FunctionDef; import org.cqframework.cql.elm.execution.Library; import org.cqframework.cql.elm.tracking.TrackBack; import org.fhir.ucum.UcumEssenceService; import org.fhir.ucum.UcumException; import org.fhir.ucum.UcumService; -import org.opencds.cqf.cql.engine.runtime.Code; -import org.opencds.cqf.cql.engine.runtime.Concept; -import org.opencds.cqf.cql.engine.runtime.CqlList; -import org.opencds.cqf.cql.engine.runtime.DateTime; -import org.opencds.cqf.cql.engine.runtime.Interval; -import org.opencds.cqf.cql.engine.runtime.Quantity; -import org.opencds.cqf.cql.engine.runtime.Time; -import org.opencds.cqf.cql.engine.runtime.Tuple; +import org.opencds.cqf.cql.engine.runtime.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.Test; -public class CqlTestSuite { +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.math.BigDecimal; +import java.net.URLDecoder; +import java.time.ZonedDateTime; +import java.util.*; - private static final Logger logger = LoggerFactory.getLogger(CqlTestSuite.class); +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; - // This test is for the various CQL operators - @Test - public void testMainSuite() throws IOException, UcumException { - Library library = translate("portable/CqlTestSuite.cql"); - Context context = new Context(library, ZonedDateTime.of(2018, 1, 1, 7, 0, 0, 0, TimeZone.getDefault().toZoneId())); - if (library.getStatements() != null) { - for (ExpressionDef expression : library.getStatements().getDef()) { - if (expression instanceof FunctionDef) { - continue; - } - if (expression.getName().startsWith("test")) { - logger.info((String) expression.evaluate(context)); - } - } - } - } +public class CqlInternalTypeRepresentationSuiteTest { - // This test is for the runtime errors - @Test - public void testErrorSuite() throws IOException, UcumException { - Library library = translate("portable/CqlErrorTestSuite.cql"); - Context context = new Context(library, ZonedDateTime.of(2018, 1, 1, 7, 0, 0, 0, TimeZone.getDefault().toZoneId())); - if (library.getStatements() != null) { - for (ExpressionDef expression : library.getStatements().getDef()) { - try { - expression.evaluate(context); - logger.error("Test " + expression.getName() + " should result in an error"); - Assert.fail(); - } - catch (Exception e) { - // pass - logger.info(expression.getName() + " TEST PASSED"); - } - } - } - } + private static final Logger logger = LoggerFactory.getLogger(CqlInternalTypeRepresentationSuiteTest.class); // This test is to check the validity of the internal representation of the CQL types (OPTIONAL) @Test @@ -398,7 +348,7 @@ private Library translate(String file) throws UcumException, IOException { if (translator.getErrors().size() > 0) { System.err.println("Translation failed due to errors:"); ArrayList errors = new ArrayList<>(); - for (CqlTranslatorException error : translator.getErrors()) { + for (CqlCompilerException error : translator.getErrors()) { TrackBack tb = error.getLocator(); String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); @@ -410,7 +360,7 @@ private Library translate(String file) throws UcumException, IOException { assertThat(translator.getErrors().size(), is(0)); - String json = translator.toJxson(); + String json = translator.toJson(); return JsonCqlLibraryReader.read(new StringReader(json)); } diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlMainSuiteTest.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlMainSuiteTest.java new file mode 100644 index 000000000..783c95a45 --- /dev/null +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlMainSuiteTest.java @@ -0,0 +1,114 @@ +package org.opencds.cqf.cql.engine.execution; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; + +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URLDecoder; +import java.time.ZonedDateTime; +import java.util.*; + +import org.cqframework.cql.cql2elm.CqlTranslator; +import org.cqframework.cql.cql2elm.CqlCompilerException; +import org.cqframework.cql.cql2elm.LibraryManager; +import org.cqframework.cql.cql2elm.ModelManager; +import org.cqframework.cql.elm.execution.ExpressionDef; +import org.cqframework.cql.elm.execution.FunctionDef; +import org.cqframework.cql.elm.execution.Library; +import org.cqframework.cql.elm.tracking.TrackBack; +import org.fhir.ucum.UcumEssenceService; +import org.fhir.ucum.UcumException; +import org.fhir.ucum.UcumService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.ITest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Factory; +import org.testng.annotations.Test; + +public class CqlMainSuiteTest implements ITest { + + private static final Logger logger = LoggerFactory.getLogger(CqlMainSuiteTest.class); + + private ExpressionDef expression; + private Context context; + + @Factory(dataProvider = "dataMethod") + public CqlMainSuiteTest(Context context, ExpressionDef expression) { + this.expression = expression; + this.context = context; + } + + @DataProvider + public static Object[][] dataMethod() throws UcumException, IOException { + String[] listOfFiles = { + "portable/CqlTestSuite.cql", + }; + + List testsToRun = new ArrayList<>(); + for (String file: listOfFiles) { + Library library = translate(file); + Context context = new Context(library, ZonedDateTime.of(2018, 1, 1, 7, 0, 0, 0, TimeZone.getDefault().toZoneId())); + if (library.getStatements() != null) { + for (ExpressionDef expression : library.getStatements().getDef()) { + if (expression instanceof FunctionDef) { + continue; + } + if (expression.getName().startsWith("test")) { + testsToRun.add(new Object[] { + context, + expression + }); + } + } + } + } + return testsToRun.toArray(new Object[testsToRun.size()][]); + } + + @Override + public String getTestName() { + return expression.getName(); + } + + // This test is for the various CQL operators + @Test + public void testMainSuite() throws IOException, UcumException { + Assert.assertEquals( + ((String)expression.evaluate(context)), + getTestName().replaceAll("test_", "") + " TEST PASSED" + ); + } + + private static Library translate(String file) throws UcumException, IOException { + ModelManager modelManager = new ModelManager(); + LibraryManager libraryManager = new LibraryManager(modelManager); + UcumService ucumService = new UcumEssenceService(UcumEssenceService.class.getResourceAsStream("/ucum-essence.xml")); + + File cqlFile = new File(URLDecoder.decode(CqlMainSuiteTest.class.getResource(file).getFile(), "UTF-8")); + + CqlTranslator translator = CqlTranslator.fromFile(cqlFile, modelManager, libraryManager, ucumService); + + if (translator.getErrors().size() > 0) { + System.err.println("Translation failed due to errors:"); + ArrayList errors = new ArrayList<>(); + for (CqlCompilerException error : translator.getErrors()) { + TrackBack tb = error.getLocator(); + String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", + tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); + System.err.printf("%s %s%n", lines, error.getMessage()); + errors.add(lines + error.getMessage()); + } + throw new IllegalArgumentException(errors.toString()); + } + + assertThat(translator.getErrors().size(), is(0)); + + String json = translator.toJson(); + + return JsonCqlLibraryReader.read(new StringReader(json)); + } +} diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlPerformanceIT.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlPerformanceIT.java index 28428ff7f..a93b5e73e 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlPerformanceIT.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlPerformanceIT.java @@ -10,14 +10,17 @@ import java.net.URLDecoder; import java.time.Duration; import java.time.Instant; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collections; +import java.util.TimeZone; import org.cqframework.cql.cql2elm.CqlTranslator; -import org.cqframework.cql.cql2elm.CqlTranslatorException; +import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.LibraryManager; import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.elm.execution.Library; +import org.cqframework.cql.elm.execution.VersionedIdentifier; import org.cqframework.cql.elm.tracking.TrackBack; import org.fhir.ucum.UcumEssenceService; import org.fhir.ucum.UcumException; @@ -45,9 +48,10 @@ public void testEngineInit() throws IOException, UcumException { @Test public void testMainSuite() throws IOException, UcumException { Library library = translate("portable/CqlTestSuite.cql"); + ZonedDateTime date = ZonedDateTime.of(2018, 1, 1, 7, 0, 0, 0, TimeZone.getDefault().toZoneId()); LibraryLoader libraryLoader = new InMemoryLibraryLoader(Collections.singleton(library)); - runPerformanceTest("CqlTestSuite", "CqlTestSuite", libraryLoader, 350.0); + runPerformanceTest("CqlTestSuite", "CqlTestSuite", libraryLoader, 350.0, date); } // This test is for the runtime errors @@ -81,7 +85,7 @@ private Library translate(String file) throws UcumException, IOException { if (translator.getErrors().size() > 0) { System.err.println("Translation failed due to errors:"); ArrayList errors = new ArrayList<>(); - for (CqlTranslatorException error : translator.getErrors()) { + for (CqlCompilerException error : translator.getErrors()) { TrackBack tb = error.getLocator(); String lines = tb == null ? "[n/a]" : String.format("[%d:%d, %d:%d]", tb.getStartLine(), tb.getStartChar(), tb.getEndLine(), tb.getEndChar()); @@ -93,26 +97,33 @@ private Library translate(String file) throws UcumException, IOException { assertThat(translator.getErrors().size(), is(0)); - String json = translator.toJxson(); + String json = translator.toJson(); return JsonCqlLibraryReader.read(new StringReader(json)); } private void runPerformanceTest(String testName, String libraryName, LibraryLoader libraryLoader, Double maxPerIterationMs) { + runPerformanceTest(testName, libraryName, libraryLoader, maxPerIterationMs, null); + } + + private void runPerformanceTest(String testName, String libraryName, LibraryLoader libraryLoader, Double maxPerIterationMs, ZonedDateTime evaluationZonedDateTime) { // A new CqlEngine is created for each loop because it resets and rebuilds the context completely. // Warm up the JVM for (int i = 0; i < ITERATIONS; i++) { CqlEngine engine = new CqlEngine(libraryLoader); - engine.evaluate(libraryName); + engine.evaluate(new VersionedIdentifier().withId(libraryName), null, null, + null, null, evaluationZonedDateTime); } Instant start = Instant.now(); for (int i = 0; i < ITERATIONS; i++) { CqlEngine engine = new CqlEngine(libraryLoader); - engine.evaluate(libraryName); + engine.evaluate(new VersionedIdentifier().withId(libraryName), null, null, + null, null, evaluationZonedDateTime); } Instant finish = Instant.now(); + long timeElapsed = Duration.between(start, finish).toMillis(); Double perIteration = (double)timeElapsed / (double)ITERATIONS; diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTypeOperatorsTest.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTypeOperatorsTest.java index 396fbf8a6..2f13b6ff8 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTypeOperatorsTest.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/CqlTypeOperatorsTest.java @@ -386,7 +386,7 @@ public void testToLong() { Context context = new Context(library); Object result = context.resolveExpressionRef("String123ToLong").getExpression().evaluate(context); - assertThat(result, is(new Long(123))); + assertThat(result, is(123L)); } /** diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TestLibraryLoader.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TestLibraryLoader.java index 91335b989..49f8ab570 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TestLibraryLoader.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TestLibraryLoader.java @@ -9,16 +9,22 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; -import org.cqframework.cql.cql2elm.CqlTranslatorException; +import org.cqframework.cql.cql2elm.CqlCompilerException; import org.cqframework.cql.cql2elm.CqlTranslatorOptions; import org.cqframework.cql.cql2elm.LibraryManager; +import org.cqframework.cql.cql2elm.model.CompiledLibrary; import org.cqframework.cql.cql2elm.model.serialization.LibraryWrapper; import org.cqframework.cql.elm.execution.Library; import org.cqframework.cql.elm.execution.VersionedIdentifier; +import org.hl7.cql_annotations.r1.CqlToElmBase; +import org.opencds.cqf.cql.engine.elm.execution.CqlToElmBaseMixIn; public class TestLibraryLoader implements LibraryLoader { @@ -57,24 +63,28 @@ private Library resolveLibrary(VersionedIdentifier libraryIdentifier) { } private Library loadLibrary(VersionedIdentifier libraryIdentifier) { - List errors = new ArrayList<>(); + List errors = new ArrayList<>(); org.hl7.elm.r1.VersionedIdentifier identifier = new org.hl7.elm.r1.VersionedIdentifier() .withId(libraryIdentifier.getId()) .withSystem(libraryIdentifier.getSystem()) .withVersion(libraryIdentifier.getVersion()); - org.cqframework.cql.cql2elm.model.TranslatedLibrary translatedLibrary = libraryManager.resolveLibrary(identifier, CqlTranslatorOptions.defaultOptions(), errors); + CompiledLibrary compiledLibrary = libraryManager.resolveLibrary(identifier, CqlTranslatorOptions.defaultOptions(), errors); LibraryWrapper wrapper = new LibraryWrapper(); - wrapper.setLibrary(translatedLibrary.getLibrary()); + wrapper.setLibrary(compiledLibrary.getLibrary()); String json; try { - ObjectMapper mapper = new ObjectMapper(); - mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_DEFAULT); - mapper.configure(SerializationFeature.INDENT_OUTPUT, true); - JaxbAnnotationModule annotationModule = new JaxbAnnotationModule(); - mapper.registerModule(annotationModule); + ObjectMapper mapper = JsonMapper.builder() + .defaultMergeable(true) + .enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL) + .defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL)) + .addModule(new JaxbAnnotationModule()) + .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class) + .build(); json = mapper.writeValueAsString(wrapper); } catch (JsonProcessingException e) { diff --git a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TranslatingTestBase.java b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TranslatingTestBase.java index 2eee459a0..46ef2ff38 100644 --- a/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TranslatingTestBase.java +++ b/engine/src/test/java/org/opencds/cqf/cql/engine/execution/TranslatingTestBase.java @@ -3,17 +3,24 @@ import java.io.IOException; import java.io.StringReader; import java.util.Map; + import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.json.JsonMapper; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import org.cqframework.cql.cql2elm.CqlTranslator; import org.cqframework.cql.cql2elm.LibraryManager; import org.cqframework.cql.cql2elm.ModelManager; import org.cqframework.cql.cql2elm.model.serialization.LibraryWrapper; -import org.cqframework.cql.elm.execution.Library; + +import org.cqframework.cql.elm.execution.*; +import org.hl7.cql_annotations.r1.CqlToElmBase; +import org.opencds.cqf.cql.engine.elm.execution.*; public class TranslatingTestBase { @@ -33,7 +40,7 @@ public Library toLibrary(String text) throws IOException { public Library toLibrary(String text, ModelManager modelManager, LibraryManager libraryManager) throws IOException { CqlTranslator translator = CqlTranslator.fromText(text, modelManager, libraryManager); - return this.readJson(translator.toJxson()); + return this.readJson(translator.toJson()); } public Library readJson(String json) throws IOException { @@ -48,13 +55,16 @@ public String convertToJson(org.hl7.elm.r1.Library library) throws JsonProcessin LibraryWrapper wrapper = new LibraryWrapper(); wrapper.setLibrary(library); - ObjectMapper mapper = new ObjectMapper(); - mapper.setDefaultPropertyInclusion(JsonInclude.Include.NON_DEFAULT); - mapper.configure(SerializationFeature.INDENT_OUTPUT, true); - JaxbAnnotationModule annotationModule = new JaxbAnnotationModule(); - mapper.registerModule(annotationModule); + ObjectMapper mapper = JsonMapper.builder() + .defaultMergeable(true) + .enable(SerializationFeature.INDENT_OUTPUT) + .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) + .enable(MapperFeature.USE_BASE_TYPE_AS_DEFAULT_IMPL) + .defaultPropertyInclusion(JsonInclude.Value.construct(JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL)) + .addModule(new JaxbAnnotationModule()) + .addMixIn(CqlToElmBase.class, CqlToElmBaseMixIn.class) + .build(); return mapper.writeValueAsString(wrapper); } - } diff --git a/engine/src/test/resources/org/opencds/cqf/cql/engine/execution/portable/CqlTestSuite.cql b/engine/src/test/resources/org/opencds/cqf/cql/engine/execution/portable/CqlTestSuite.cql index 8a24ee533..15ce5faad 100644 --- a/engine/src/test/resources/org/opencds/cqf/cql/engine/execution/portable/CqlTestSuite.cql +++ b/engine/src/test/resources/org/opencds/cqf/cql/engine/execution/portable/CqlTestSuite.cql @@ -988,8 +988,8 @@ define test_GreaterOrEqual_ALtB_Quantity: TestMessage(not GreaterOrEqual_ALtB_Qu // If define function IfThenElse(var Boolean): if var then 'true return' else 'false return' -define test_If_true: TestMessage(IfThenElse(true) = 'true return', 'IfThenElse(true)', 'true return', IfThenElse(true)) -define test_If_false: TestMessage(IfThenElse(false) = 'false return', 'IfThenElse(false)', 'false return', IfThenElse(false)) +define test_IfThenElse_true: TestMessage(IfThenElse(true) = 'true return', 'IfThenElse_true', 'true return', IfThenElse(true)) +define test_IfThenElse_false: TestMessage(IfThenElse(false) = 'false return', 'IfThenElse_false', 'false return', IfThenElse(false)) // Case @@ -1001,9 +1001,9 @@ define function Case_selected(var Integer): '?' end -define test_Case_Select_1: TestMessage(Case_selected(1) = 'one', 'Case_selected(1)', 'one', Case_selected(1)) -define test_Case_Select_2: TestMessage(Case_selected(2) = 'two', 'Case_selected(2)', 'two', Case_selected(2)) -define test_Case_Select_3: TestMessage(Case_selected(3) = '?', 'Case_selected(3)', '?', Case_selected(3)) +define test_Case_selected_1: TestMessage(Case_selected(1) = 'one', 'Case_selected_1', 'one', Case_selected(1)) +define test_Case_selected_2: TestMessage(Case_selected(2) = 'two', 'Case_selected_2', 'two', Case_selected(2)) +define test_Case_selected_3: TestMessage(Case_selected(3) = '?', 'Case_selected_3', '?', Case_selected(3)) define function Case_standard(X Integer, Y Integer): case @@ -1012,9 +1012,9 @@ define function Case_standard(X Integer, Y Integer): else 'X == Y' end -define test_Case_Standard_1_2: TestMessage(Case_standard(1, 2) = 'X < Y', 'Case_standard(1, 2)', 'X < Y', Case_standard(1, 2)) -define test_Case_Standard_2_1: TestMessage(Case_standard(2, 1) = 'X > Y', 'Case_standard(2, 1)', 'X > Y', Case_standard(2, 1)) -define test_Case_Standard_1_1: TestMessage(Case_standard(1, 1) = 'X == Y', 'Case_standard(1, 1)', 'X == Y', Case_standard(1, 1)) +define test_Case_Standard_1_2: TestMessage(Case_standard(1, 2) = 'X < Y', 'Case_Standard_1_2', 'X < Y', Case_standard(1, 2)) +define test_Case_Standard_2_1: TestMessage(Case_standard(2, 1) = 'X > Y', 'Case_Standard_2_1', 'X > Y', Case_standard(2, 1)) +define test_Case_Standard_1_1: TestMessage(Case_standard(1, 1) = 'X == Y', 'Case_Standard_1_1', 'X == Y', Case_standard(1, 1)) /* ************************* @@ -3289,7 +3289,7 @@ define test_OverlapsDT_OverlapsContained: TestMessage(OverlapsDT_OverlapsContain define test_OverlapsDT_OverlapsContains: TestMessage(OverlapsDT_OverlapsContains, 'OverlapsDT_OverlapsContains', toString(true), toString(OverlapsDT_OverlapsContains)) // define test_OverlapsDT_ImpreciseOverlap: TestMessage(OverlapsDT_ImpreciseOverlap, 'OverlapsDT_ImpreciseOverlap', toString(true), toString(OverlapsDT_ImpreciseOverlap)) define test_OverlapsDT_NoOverlap: TestMessage(not OverlapsDT_NoOverlap, 'OverlapsDT_NoOverlap', toString(false), toString(OverlapsDT_NoOverlap)) -define test_OverlapsDT_NoImpreciseOverlap: TestMessage(not OverlapsDT_NoImpreciseOverlap, 'OverlapsDT_OverlapsBefore', toString(false), toString(OverlapsDT_OverlapsBefore)) +define test_OverlapsDT_NoImpreciseOverlap: TestMessage(not OverlapsDT_NoImpreciseOverlap, 'OverlapsDT_NoImpreciseOverlap', toString(false), toString(OverlapsDT_OverlapsBefore)) define test_OverlapsDT_UnknownOverlap: TestMessage(OverlapsDT_UnknownOverlap is null, 'OverlapsDT_UnknownOverlap', 'null', toString(OverlapsDT_UnknownOverlap)) define test_OverlapsDT_MatchingPrecisionOverlap: TestMessage(OverlapsDT_MatchingPrecisionOverlap, 'OverlapsDT_MatchingPrecisionOverlap', toString(true), toString(OverlapsDT_MatchingPrecisionOverlap)) define test_OverlapsDT_OverlapsBeforeDayOfIvlEdge: TestMessage(OverlapsDT_OverlapsBeforeDayOfIvlEdge, 'OverlapsDT_OverlapsBeforeDayOfIvlEdge', toString(true), toString(OverlapsDT_OverlapsBeforeDayOfIvlEdge)) @@ -3349,7 +3349,7 @@ define test_OverlapsAfterDT_OverlapsContains: TestMessage(OverlapsAfterDT_Overla define test_OverlapsAfterDT_ImpreciseOverlapBefore: TestMessage(not OverlapsAfterDT_ImpreciseOverlapBefore, 'OverlapsAfterDT_ImpreciseOverlapBefore', toString(false), toString(OverlapsAfterDT_ImpreciseOverlapBefore)) define test_OverlapsAfterDT_ImpreciseOverlapAfter: TestMessage(OverlapsAfterDT_ImpreciseOverlapAfter, 'OverlapsAfterDT_ImpreciseOverlapAfter', toString(true), toString(OverlapsAfterDT_ImpreciseOverlapAfter)) define test_OverlapsAfterDT_NoOverlap: TestMessage(not OverlapsAfterDT_NoOverlap, 'OverlapsAfterDT_NoOverlap', toString(false), toString(OverlapsAfterDT_NoOverlap)) -define test_OverlapsAfterDT_NoImpreciseOverlap: TestMessage(not OverlapsAfterDT_NoImpreciseOverlap, 'OverlapsAfterDT_OverlapsBefore', toString(false), toString(OverlapsAfterDT_OverlapsBefore)) +define test_OverlapsAfterDT_NoImpreciseOverlap: TestMessage(not OverlapsAfterDT_NoImpreciseOverlap, 'OverlapsAfterDT_NoImpreciseOverlap', toString(false), toString(OverlapsAfterDT_NoImpreciseOverlap)) define test_OverlapsAfterDT_MatchingPrecisionOverlap: TestMessage(OverlapsAfterDT_MatchingPrecisionOverlap, 'OverlapsAfterDT_MatchingPrecisionOverlap', toString(true), toString(OverlapsAfterDT_MatchingPrecisionOverlap)) define test_OverlapsAfterDT_UnknownOverlap: TestMessage(OverlapsAfterDT_UnknownOverlap is null, 'OverlapsAfterDT_UnknownOverlap', 'null', toString(OverlapsAfterDT_UnknownOverlap)) define test_OverlapsAfterDT_OverlapsBeforeDayOfIvlEdge: TestMessage(not OverlapsAfterDT_OverlapsBeforeDayOfIvlEdge, 'OverlapsAfterDT_OverlapsBeforeDayOfIvlEdge', toString(false), toString(OverlapsAfterDT_OverlapsBeforeDayOfIvlEdge)) @@ -3408,7 +3408,7 @@ define test_OverlapsBeforeDT_OverlapsContains: TestMessage(OverlapsBeforeDT_Over define test_OverlapsBeforeDT_ImpreciseOverlapAfter: TestMessage(not OverlapsBeforeDT_ImpreciseOverlapAfter, 'OverlapsBeforeDT_ImpreciseOverlapAfter', toString(false), toString(OverlapsBeforeDT_ImpreciseOverlapAfter)) define test_OverlapsBeforeDT_ImpreciseOverlapBefore: TestMessage(OverlapsBeforeDT_ImpreciseOverlapBefore, 'OverlapsBeforeDT_ImpreciseOverlapBefore', toString(true), toString(OverlapsBeforeDT_ImpreciseOverlapBefore)) define test_OverlapsBeforeDT_NoOverlap: TestMessage(not OverlapsBeforeDT_NoOverlap, 'OverlapsBeforeDT_NoOverlap', toString(false), toString(OverlapsBeforeDT_NoOverlap)) -define test_OverlapsBeforeDT_NoImpreciseOverlap: TestMessage(not OverlapsBeforeDT_NoImpreciseOverlap, 'OverlapsBeforeDT_OverlapsBefore', toString(false), toString(OverlapsBeforeDT_OverlapsBefore)) +define test_OverlapsBeforeDT_NoImpreciseOverlap: TestMessage(not OverlapsBeforeDT_NoImpreciseOverlap, 'OverlapsBeforeDT_NoImpreciseOverlap', toString(false), toString(OverlapsBeforeDT_NoImpreciseOverlap)) define test_OverlapsBeforeDT_MatchingPrecisionOverlap: TestMessage(OverlapsBeforeDT_MatchingPrecisionOverlap, 'OverlapsBeforeDT_MatchingPrecisionOverlap', toString(true), toString(OverlapsBeforeDT_MatchingPrecisionOverlap)) define test_OverlapsBeforeDT_UnknownOverlap: TestMessage(OverlapsBeforeDT_UnknownOverlap is null, 'OverlapsBeforeDT_UnknownOverlap', 'null', toString(OverlapsBeforeDT_UnknownOverlap)) define test_OverlapsBeforeDT_OverlapsBeforeDayOfIvlEdge: TestMessage(OverlapsBeforeDT_OverlapsBeforeDayOfIvlEdge, 'OverlapsBeforeDT_OverlapsBeforeDayOfIvlEdge', toString(true), toString(OverlapsBeforeDT_OverlapsBeforeDayOfIvlEdge)) @@ -3848,8 +3848,9 @@ define test_NullIvlCollapse_NullPerCollapse: TestMessage(NullIvlCollapse_NullPer define test_NullIvlCollapse_DateTimeNullEndCollapseNoOverlap: TestMessage(NullIvlCollapse_DateTimeNullEndCollapseNoOverlap = DateTimeNullEndCollapseNoOverlapExpected, 'NullIvlCollapse_DateTimeNullEndCollapseNoOverlap', toString(DateTimeNullEndCollapseNoOverlapExpected), toString(NullIvlCollapse_DateTimeNullEndCollapseNoOverlap)) define test_NullIvlCollapse_DateTimeNullStartCollapseNoOverlap: TestMessage(NullIvlCollapse_DateTimeNullStartCollapseNoOverlap = DateTimeNullStartCollapseNoOverlapExpected, 'NullIvlCollapse_DateTimeNullStartCollapseNoOverlap', toString(DateTimeNullStartCollapseNoOverlapExpected), toString(NullIvlCollapse_DateTimeNullStartCollapseNoOverlap)) define test_NullIvlCollapse_DateTimeNullStartEndCollapse: TestMessage(NullIvlCollapse_DateTimeNullStartEndCollapse = DateTimeNullStartEndCollapseExpected, 'NullIvlCollapse_DateTimeNullStartEndCollapse', toString(DateTimeNullStartEndCollapseExpected), toString(NullIvlCollapse_DateTimeNullStartEndCollapse)) -define test_NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer: TestMessage(NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer = CollapseQuantityNullLowUnitsWithinPerExpected, 'NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer', toString(CollapseQuantityNullLowUnitsWithinPerExpected), toString(NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer)) -define test_NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer: TestMessage(NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer = CollapseQuantityNullHighUnitsWithinPerExpected, 'NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer', toString(CollapseQuantityNullHighUnitsWithinPerExpected), toString(NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer)) +//TODO: Fix non Datetime intervals with null +//define test_NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer: TestMessage(NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer = CollapseQuantityNullLowUnitsWithinPerExpected, 'NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer', toString(CollapseQuantityNullLowUnitsWithinPerExpected), toString(NullIvlCollapse_CollapseQuantityNullLowUnitsWithinPer)) +//define test_NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer: TestMessage(NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer = CollapseQuantityNullHighUnitsWithinPerExpected, 'NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer', toString(CollapseQuantityNullHighUnitsWithinPerExpected), toString(NullIvlCollapse_CollapseQuantityNullHighUnitsWithinPer)) define test_NullIvlCollapse_CollapseQuantityIntervalListWithNulls: TestMessage(NullIvlCollapse_CollapseQuantityIntervalListWithNulls = CollapseQuantityIntervalListWithNullsExpected, 'NullIvlCollapse_CollapseQuantityIntervalListWithNulls', toString(CollapseQuantityIntervalListWithNullsExpected), toString(NullIvlCollapse_CollapseQuantityIntervalListWithNulls)) define test_NullIvlCollapse_CollapseQuantityIntervalListWithNullLowNoOverlap: TestMessage(NullIvlCollapse_CollapseQuantityIntervalListWithNullLowNoOverlap = CollapseQuantityIntervalListWithNullLowNoOverlapExpected, 'NullIvlCollapse_CollapseQuantityIntervalListWithNullLowNoOverlap', toString(CollapseQuantityIntervalListWithNullLowNoOverlapExpected), toString(NullIvlCollapse_CollapseQuantityIntervalListWithNullLowNoOverlap)) define test_NullIvlCollapse_CollapseQuantityIntervalListWithNullHighNoOverlap: TestMessage(NullIvlCollapse_CollapseQuantityIntervalListWithNullHighNoOverlap = CollapseQuantityIntervalListWithNullHighNoOverlapExpected, 'NullIvlCollapse_CollapseQuantityIntervalListWithNullHighNoOverlap', toString(CollapseQuantityIntervalListWithNullHighNoOverlapExpected), toString(NullIvlCollapse_CollapseQuantityIntervalListWithNullHighNoOverlap)) @@ -4516,13 +4517,13 @@ define Exists_ListStartingWithNull: exists ({ null, 3, 4 }) define Exists_ListWithNull: exists ({ 3, null, 5 }) define Exists_NullExists: exists (null) -define test_Exists_EmptyList: TestMessage(not Exists_EmptyList, 'Exists_EmptyList', toString(false), toString(Exists_EmptyList)) -define test_Exists_FullList: TestMessage(Exists_FullList, 'Exists_FullList', toString(true), toString(Exists_FullList)) -define test_Exists_ListWithOneNull: TestMessage(Exists_ListWithOneNull, 'Exists_ListWithOneNull', toString(true), toString(Exists_ListWithOneNull)) -define test_Exists_ListWithTwoNulls: TestMessage(Exists_ListWithTwoNulls, 'Exists_ListWithTwoNulls', toString(true), toString(Exists_ListWithTwoNulls)) -define test_Exists_ListStartingWithNull: TestMessage(Exists_ListStartingWithNull, 'Exists_ListStartingWithNull', toString(true), toString(Exists_ListStartingWithNull)) -define test_Exists_ListWithNull: TestMessage(Exists_ListWithNull, 'Exists_ListWithNull', toString(true), toString(Exists_ListWithNull)) -define test_Exists_NullExists: TestMessage(not Exists_NullExists, 'Exists_NullExists', toString(false), toString(Exists_NullExists)) +define test_Exists_EmptyList: TestMessage(Exists_EmptyList = false, 'Exists_EmptyList', toString(false), toString(Exists_EmptyList)) +define test_Exists_FullList: TestMessage(Exists_FullList = true, 'Exists_FullList', toString(true), toString(Exists_FullList)) +define test_Exists_ListWithOneNull: TestMessage(Exists_ListWithOneNull = false, 'Exists_ListWithOneNull', toString(false), toString(Exists_ListWithOneNull)) +define test_Exists_ListWithTwoNulls: TestMessage(Exists_ListWithTwoNulls = false, 'Exists_ListWithTwoNulls', toString(false), toString(Exists_ListWithTwoNulls)) +define test_Exists_ListStartingWithNull: TestMessage(Exists_ListStartingWithNull = true, 'Exists_ListStartingWithNull', toString(true), toString(Exists_ListStartingWithNull)) +define test_Exists_ListWithNull: TestMessage(Exists_ListWithNull = true, 'Exists_ListWithNull', toString(true), toString(Exists_ListWithNull)) +define test_Exists_NullExists: TestMessage(Exists_NullExists = false, 'Exists_NullExists', toString(false), toString(Exists_NullExists)) // Equal define Equal_EqualIntList: {1, 2, 3} = {1, 2, 3} diff --git a/pom.xml b/pom.xml index 7e4b0ac52..ff1ff3036 100644 --- a/pom.xml +++ b/pom.xml @@ -50,9 +50,10 @@ UTF-8 2.13.2 2.13.2.1 - 1.5.11 - 5.6.3 + 2.0.0 + 6.0.1 1.7.29 + 3.0.0-M7 @@ -82,18 +83,30 @@ + + + org.apache.commons + commons-text + 1.9 + org.jvnet.jaxb2_commons - jaxb2-basics - 0.12.0 + jaxb2-basics-runtime + 0.13.1 + + + jakarta.xml.bind + jakarta.xml.bind-api + 2.3.3 org.eclipse.persistence org.eclipse.persistence.moxy 2.7.7 + test @@ -117,6 +130,11 @@ jackson-module-jaxb-annotations ${jackson.version} + + com.fasterxml.jackson.dataformat + jackson-dataformat-xml + ${jackson.version} + @@ -204,18 +222,56 @@ + + info.cqframework cql-to-elm ${cqframework.version} - test + + info.cqframework + fhir-r4 + ${cqframework.version} + test + + + info.cqframework + quick + ${cqframework.version} + test + + + info.cqframework + elm-jackson + ${cqframework.version} + test + + + info.cqframework + model-jackson + ${cqframework.version} + test + + + info.cqframework + elm-jaxb + ${cqframework.version} + test + + + info.cqframework + model-jaxb + ${cqframework.version} + test + + org.testng testng - 7.5 + 7.6.0 test @@ -224,6 +280,7 @@ 1.3 test + uk.co.datumedge hamcrest-json @@ -236,6 +293,7 @@ test + org.slf4j slf4j-api @@ -255,7 +313,7 @@ com.github.tomakehurst wiremock-jre8 - 2.32.0 + 2.33.2 test @@ -263,21 +321,20 @@ - - info.cqframework - cql-to-elm - org.testng testng + test org.hamcrest hamcrest-all + test uk.co.datumedge hamcrest-json + test org.slf4j @@ -296,7 +353,7 @@ com.puppycrawl.tools checkstyle - 9.2.1 + 10.3 @@ -325,15 +382,7 @@ com.github.spotbugs spotbugs-maven-plugin - 4.5.0.0 - - - - com.github.spotbugs - spotbugs - 4.5.2 - - + 4.7.0.0 Max @@ -344,40 +393,21 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0-M1 + 3.0.0-M2 org.jvnet.jaxb2.maven2 maven-jaxb2-plugin - - 0.14.0 - - - - org.glassfish.jaxb - jaxb-runtime - 2.4.0-b180830.0438 - - - org.jvnet.jaxb2.maven2 - maven-jaxb23-plugin - 0.14.0 - - - org.glassfish.jaxb - jaxb-runtime - - - - + 0.15.1 org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.10.1 - 1.8 - 1.8 + 11 + 11 + 11 true false @@ -391,7 +421,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.1.2 + 3.2.2 @@ -404,9 +434,9 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.3.1 + 3.4.0 - 8 + 11 @@ -420,7 +450,7 @@ org.apache.maven.plugins maven-source-plugin - 3.1.0 + 3.2.1 attach-sources @@ -433,7 +463,7 @@ org.apache.maven.plugins maven-gpg-plugin - 1.6 + 3.0.1 sign-artifacts @@ -447,7 +477,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13 true ossrh @@ -459,7 +489,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.0.0-M2 + 3.1.0 enforce-no-snapshots @@ -483,7 +513,7 @@ org.apache.maven.plugins maven-failsafe-plugin - 2.19.1 + ${surefire.version} true @@ -499,12 +529,12 @@ org.apache.maven.plugins maven-surefire-plugin - 2.21.0 + ${surefire.version} org.codehaus.mojo build-helper-maven-plugin - 3.0.0 + 3.3.0 org.jacoco @@ -529,12 +559,12 @@ org.apache.maven.plugins maven-pmd-plugin - 3.15.0 + 3.17.0 org.ow2.asm asm - 9.2 + 9.3 @@ -554,7 +584,7 @@ org.apache.maven.plugins maven-jxr-plugin - 3.1.1 + 3.2.0 @@ -640,9 +670,9 @@ - java-9 + java-11 - [9,) + [11,) @@ -651,7 +681,7 @@ org.apache.maven.plugins maven-compiler-plugin - 8 + 11